CRM-15474 - Move js-based form alterations to php
CRM-15593 Prevent contributions being imported for is_deleted contacts
Merge pull request #4551 from kenwest/CRM-15593

CRM-15593 Prevent contributions being imported for is_deleted contacts
CRM-15597 - Fix display of frozen custom contactRef fields
Merge pull request #4562 from colemanw/CRM-15597

CRM-15597 - Fix display of frozen custom contactRef fields
Merge branch 'CRM-15474' of github.com:colemanw/civicrm-core into CRM-15527

Conflicts:
	templates/CRM/Event/Form/Participant.tpl

----------------------------------------
* CRM-15474: Event cart option js breaks "add participant" form
  https://issues.civicrm.org/jira/browse/CRM-15474
* CRM-15527: error in IPN relating to numRelatedMemberships
  https://issues.civicrm.org/jira/browse/CRM-15527
Merge pull request #4570 from kurund/CRM-15527

CRM-15527