prevent people from selecting contribution amounts if member priceset
CRM-13880 - fix sample data to always set payment_instrument.

----------------------------------------
* CRM-13880: Make payment instrument required for all contribution, event registration and membership forms
  http://issues.civicrm.org/jira/browse/CRM-13880
CRM-13890 - Cleanup message template text. Update obsolete wiki reference in Legacy.php.

----------------------------------------
* CRM-13890: Participant status is not being passed to message template for online event registration
  http://issues.civicrm.org/jira/browse/CRM-13890
Merge pull request #2164 from davecivicrm/CRM-13880c

CRM-13880 - fix sample data to always set payment_instrument.
Merge pull request #2165 from davecivicrm/CRM-13890

CRM-13890 - Cleanup message template text. Update obsolete wiki referenc...
CRM-13420 - Check for missing payment instruments during upgrade and give warning.

----------------------------------------
* CRM-13420: Upgrade: Report invalid data resulting from allowing transaction w/o payment instrument
  http://issues.civicrm.org/jira/browse/CRM-13420
Merge pull request #2166 from davecivicrm/CRM-13420

CRM-13420 - Check for missing payment instruments during upgrade and giv...
CRM-13836 Handle multivalued custom sets during merge
CRM-13904 - Improve proximity query accuracy

http://issues.civicrm.org/jira/browse/CRM-13904
CRM-13904 - add links to formula used

----------------------------------------
* CRM-13904: Improve proximity query accuracy
  http://issues.civicrm.org/jira/browse/CRM-13904
Merge pull request #2153 from dlobo/CRM-13904

CRM-13904 - Improve proximity query accuracy
Merge pull request #2167 from colemanw/CRM-13836

CRM-13836 Handle multivalued custom sets during merge
CRM-13890 - Test fixes (unit tests were coded against the buggy behavior where real status was not included in output).

----------------------------------------
* CRM-13890: Participant status is not being passed to message template for online event registration
  http://issues.civicrm.org/jira/browse/CRM-13890
Merge pull request #2169 from davecivicrm/CRM-13890testFix

CRM-13890 - Test fixes (unit tests were coded against the buggy behavior...
Minor tpl message fix
Update version to 4.4.4
UFGroup.php - Code cleanup
Merge pull request #2175 from colemanw/4.4

UFGroup.php - Code cleanup
Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2013-12-09-17-00-10

Conflicts:
	sql/civicrm_generated.mysql
	xml/version.xml
Merge pull request #2036 from agh1/no-amounts-member-priceset

CRM-13800 Prevent people from enabling contribution amounts when there's a membership price set