Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-05-19-00-08-12

Conflicts:
	sql/civicrm_generated.mysql
	templates/CRM/Member/Form/MembershipRenewal.tpl

diff --cc CRM/Batch/Form/Entry.php
Simple merge

diff --cc CRM/Campaign/Form/Task/Interview.php
Simple merge

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

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

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

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

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

diff --cc CRM/Logging/Schema.php
Simple merge

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

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

diff --cc CRM/Price/BAO/PriceSet.php
Simple merge

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

diff --cc templates/CRM/Activity/Form/Activity.tpl
Simple merge

diff --cc templates/CRM/Member/Form/MembershipRenewal.tpl
Simple merge

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