Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-06-01-22-27-06

Conflicts:
	CRM/Contribute/Form/Contribution/Main.php

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

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

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

diff --cc CRM/Event/Form/Registration/Register.php
Simple merge

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

diff --cc templates/CRM/Contact/Form/Task/PDFLetterCommon.tpl
Simple merge