Merge branch '4.6' into 'master'

Conflicts:
	tools/CRM/Auction/BAO/Auction.php
	tools/CRM/Auction/BAO/Item.php
	tools/CRM/Auction/Form/Auction.php
	tools/CRM/Auction/Form/Item.php

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

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

diff --cc CRM/Contribute/Form/Task/Invoice.php
Simple merge

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

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

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

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

diff --cc CRM/Core/Payment/AuthorizeNet.php
Simple merge

diff --cc CRM/Core/Payment/PayPalImpl.php
Simple merge

diff --cc js/crm.ajax.js
Simple merge