Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2014-07-07-15-48-59

Conflicts:
	CRM/Dedupe/Merger.php
	sql/civicrm_generated.mysql
	xml/version.xml

diff --cc CRM/Contact/Import/Form/MapField.php
Simple merge

diff --cc CRM/Contact/Import/Parser/Contact.php
Simple merge

diff --cc CRM/Contribute/Form/Contribution/OnBehalfOf.php
Simple merge

diff --cc CRM/Core/BAO/CustomField.php
Simple merge

diff --cc CRM/Core/BAO/CustomGroup.php
Simple merge

diff --cc CRM/Core/Page/AJAX/Location.php
Simple merge

diff --cc CRM/Dedupe/Merger.php
Simple merge

diff --cc CRM/Utils/DeprecatedUtils.php
Simple merge

diff --cc templates/CRM/Contribute/Form/Contribution/OnBehalfOf.tpl
Simple merge