Conflicts:
	CRM/Case/Form/Activity.php
	CRM/Contact/Form/Search/Custom/ContribSYBNT.php
	CRM/Contact/Form/Search/Custom/ContributionAggregate.php
	CRM/Contact/Form/Search/Custom/EventAggregate.php
	CRM/Contact/Form/Search/Custom/PriceSet.php
	CRM/Contact/Form/Search/Custom/TagContributions.php
	CRM/Core/BAO/ConfigSetting.php
	CRM/Financial/BAO/FinancialType.php
	CRM/Report/Form.php
	CRM/Report/Form/Campaign/SurveyDetails.php
	CRM/Report/Form/Contribute/Summary.php
	sql/civicrm_generated.mysql
	templates/CRM/Profile/Page/MultipleRecordFieldsListing.tpl
	tools/drupal/modules/civicrm_giftaid/GiftAid/Report/Form/Contribute/GiftAid.php