Merge remote-tracking branch 'upstream/4.5' into 4.5-master-2014-11-24-15-59-25

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

diff --cc CRM/Contribute/BAO/Contribution.php
Simple merge

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

diff --cc CRM/Event/Form/Participant.php
Simple merge

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

diff --cc js/model/crm.uf.js
Simple merge

diff --cc templates/CRM/Campaign/Form/Search/Campaign.tpl
Simple merge

diff --cc templates/CRM/Campaign/Form/Search/Petition.tpl
Simple merge

diff --cc templates/CRM/Campaign/Form/Search/Survey.tpl
Simple merge