Merge remote-tracking branch 'upstream/4.5' into 4.5-master-2014-11-14-11-21-50

Conflicts:
	CRM/Event/BAO/Query.php
	sql/civicrm_generated.mysql
	xml/version.xml

diff --cc CRM/Admin/Form/ScheduleReminders.php
Simple merge

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

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

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

diff --cc CRM/Member/BAO/Membership.php
Simple merge

diff --cc CRM/Member/Form/Membership.php
Simple merge

diff --cc CRM/Price/Page/Field.php
Simple merge

diff --cc CRM/Upgrade/Incremental/sql/4.5.alpha1.mysql.tpl
Simple merge

diff --cc css/civicrm.css
Simple merge

diff --cc templates/CRM/Contact/Form/Search/Builder.js
Simple merge

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

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