Conflicts:
	.gitignore
	CRM/Financial/Form/FinancialAccount.php
	CRM/Financial/Form/FinancialTypeAccount.php
	CRM/Grant/Controller/PaymentSearch.php
	CRM/Grant/Page/GrantProgram.php
	CRM/Grant/Page/Payment.php
	CRM/Grant/Selector/PaymentSearch.php
	CRM/Report/Form/Event/ParticipantListCount.php
	CRM/Utils/Migrate/Export.php
	CRM/Utils/Migrate/ExportJSON.php
	sql/civicrm_generated.mysql
	templates/CRM/Admin/Form/Preferences/Display.tpl
	templates/CRM/Financial/Form/FinancialTypeAccount.tpl
	templates/CRM/Grant/Form/Search.tpl