Merge branch 'development' into 7.x-0.x

Conflicts:
	modules/crm_core_default_matching_engine/crm_core_default_matching_engine.admin.inc
	modules/crm_core_default_matching_engine/crm_core_default_matching_engine.info
	modules/crm_core_default_matching_engine/crm_core_default_matching_engine.module
	modules/crm_core_default_matching_engine/includes/DateMatchField.inc
	modules/crm_core_default_matching_engine/includes/DefaultMatchingEngine.inc
	modules/crm_core_default_matching_engine/includes/NameMatchField.inc
	modules/crm_core_default_matching_engine/includes/SelectMatchField.inc
	modules/crm_core_default_matching_engine/includes/TextMatchField.inc
	modules/crm_core_devel/crm_core_devel.info
	modules/crm_core_devel/modules/crm_core_devel_generate/crm_core_devel_generate.info
	modules/crm_core_match/crm_core_match.module
	modules/crm_core_match/crm_core_match.test.inc
	modules/crm_core_match/includes/crm_core_match.inc