Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2013-11-11-10-56-09

Conflicts:
	sql/civicrm_generated.mysql
	xml/version.xml

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

diff --cc CRM/Admin/Page/OptionValue.php
Simple merge

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

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

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

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

diff --cc CRM/Mailing/BAO/Mailing.php
Simple merge

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

diff --cc CRM/Utils/Migrate/ExportJSON.php
Simple merge

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

diff --cc bin/cli.class.php
Simple merge

diff --cc xml/templates/civicrm_data.tpl
Simple merge