Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-05-28-22-50-49

Conflicts:
	ang/crmUi.js
	sql/civicrm_generated.mysql
	xml/version.xml

diff --cc CRM/Batch/Form/Entry.php
Simple merge

diff --cc CRM/Case/XMLProcessor/Report.php
Simple merge

diff --cc CRM/Contribute/BAO/Query.php
Simple merge

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

diff --cc CRM/Contribute/Form/Contribution/Main.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/Resources.php
Simple merge

diff --cc CRM/Mailing/BAO/Mailing.php
Simple merge

diff --cc CRM/Profile/Page/MultipleRecordFieldsListing.php
Simple merge

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

diff --cc ang/crmUi.js
Simple merge