Merging EDC changes.
Merge remote-tracking branch 'origin/checkbook_edc_maint_fork' into checkbook_edc_maint_fork

Conflicts:
	source/webapp/sites/all/modules/custom/checkbook_smart_search/includes/checkbook_smart_search.inc
Merging EDC changes.