CRM-15510 param retrieval issue
Merge pull request #4418 from eileenmcnaughton/4.4

CRM-15487 prefix removed from display_name
Merge pull request #4420 from eileenmcnaughton/CRM-15510-44

CRM-15510 param retrieval issue
CRM-14815 subscriptionURL() doesn't add checksum when called from CLI

Conflicts:
	CRM/Core/Payment.php
Merge pull request #4433 from eileenmcnaughton/CRM-14815

CRM-14815 subscriptionURL() doesn't add checksum when called from CLI
CRM-11342 - Fix for correct filtering of permissioned employees.

----------------------------------------
* CRM-11342:
  https://issues.civicrm.org/jira/browse/CRM-11342

Conflicts:
	CRM/Core/BAO/ActionSchedule.php
Merge pull request #4442 from eileenmcnaughton/CRM-11342

CRM-11342 - Fix for correct filtering of permissioned employees. …
CRM-14854. Highlight the selected price, not everything in that row.
Merge pull request #4444 from eileenmcnaughton/CRM-14854

CRM-14854. Highlight the selected price, not everything in that row.
CRM-14945
CRM Test Fix 4.5beta2
Merge pull request #4434 from eileenmcnaughton/CRM-14945

CRM-14945 Event confirmation email - message not saved to Activities
CRM-15535 fix static warning on CRM_Core_Payment_Form
Merge pull request #4458 from eileenmcnaughton/CRM-15535

CRM-15535 fix static warning on CRM_Core_Payment_Form
CRM-14800 fix - Contact merge deletes a contribution record if it is linked to a membership being merged

https://issues.civicrm.org/jira/browse/CRM-14800