Merge branch 4.6 into master

Conflicts:
	CRM/Utils/Api.php

diff --cc CRM/Activity/Form/Activity.php
Simple merge

diff --cc CRM/Admin/Form/ParticipantStatusType.php
Simple merge

diff --cc CRM/Admin/Form/Tag.php
Simple merge

diff --cc CRM/Campaign/Form/Campaign.php
Simple merge

diff --cc CRM/Campaign/Form/Survey/Main.php
Simple merge

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

diff --cc CRM/Contact/Form/Edit/Individual.php
Simple merge

diff --cc CRM/Contact/Form/Edit/Lock.php
Simple merge

diff --cc CRM/Contact/Form/Inline.php
Simple merge

diff --cc CRM/Contact/Form/Search.php
Simple merge

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

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

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

diff --cc CRM/Core/Form.php
Simple merge

diff --cc CRM/Event/Form/ManageEvent.php
Simple merge

diff --cc CRM/Event/Form/Participant.php
Simple merge

diff --cc CRM/Event/Form/SearchEvent.php
Simple merge

diff --cc CRM/Grant/Form/Grant.php
Simple merge

diff --cc CRM/Member/Form/MembershipConfig.php
Simple merge

diff --cc CRM/Profile/Form.php
Simple merge

diff --cc Civi/API/Subscriber/ChainSubscriber.php
Simple merge

diff --cc api/v3/Generic.php
Simple merge

diff --cc api/v3/utils.php
Simple merge

diff --cc templates/CRM/Admin/Page/APIExplorer.js
Simple merge

diff --cc templates/CRM/Contact/Form/Contact.hlp
Simple merge

diff --cc templates/CRM/Event/Form/Selector.tpl
Simple merge

diff --cc templates/CRM/Financial/Form/FinancialAccount.tpl
Simple merge

diff --cc tests/phpunit/CRM/Core/BAO/ActionScheduleTest.php
Simple merge