Conflicts:

	modules/comment/views_handler_field_comment_link_approve.inc
	modules/node/views_handler_field_history_user_timestamp.inc
	modules/system/views_handler_field_file_filemime.inc
	modules/user/views_handler_field_user_link_cancel.inc
	modules/user/views_handler_field_user_permissions.inc

#657442 by nicholasThompson and dagmar: Include "mail" field in user picture so that modules that need this do not break when rendering picture in Views.

#494490 by Niels Hackius: User picture incorrectly set as an inline element when it should be block.

Major re-organization of handlers. PLEASE NOTE: This drastically affected the Views module API and until modules are updated to match, they will stop working. Efforts have been made to ensure that this won't cause your site to crash, but that's partly up to the individual module as well.