Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2014-03-20-15-52-17

Conflicts:
	CRM/Core/BAO/UFGroup.php

diff --cc CRM/Activity/BAO/Query.php
Simple merge

diff --cc CRM/Contact/BAO/Query.php
Simple merge

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

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

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

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

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

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

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

diff --cc tests/phpunit/api/v3/SyntaxConformanceTest.php
Simple merge