CRM-15474 - Move js-based form alterations to php
CRM-15585 - Call pre hooks from api.setvalue
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
CRM-15595 - Individual sub-type custom fields don't appear in online event registration

https://issues.civicrm.org/jira/browse/CRM-15595
CRM-15611: fix send copy for case activity
Merge pull request #4576 from yashodha/CRM-15611

Tested, works fine
Merge pull request #4572 from atif-shaikh/CRM-15595

CRM-15595 - Individual sub-type custom fields don't appear in online eve...
CRM-15595 indentation fix

----------------------------------------
* CRM-15595: Individual sub-type custom fields don't appear in online event registration
  https://issues.civicrm.org/jira/browse/CRM-15595
Merge pull request #4577 from monishdeb/CRM-15595

CRM-15595 indentation fix
Encourage better scoping of js CRM vars with new addVars method
Merge pull request #4509 from colemanw/addVars

Encourage better scoping of js CRM vars with new addVars method
--CRM-10206, reverted back some changes that caused regression when creating multi value custom field value using api
--CRM-10206, added api test
Remove redundant help link
CRM-15621 - prevent fatal on payment updates with Auth.net IPN

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