minor bug fix : when we edit a membership and change its membership type...

minor bug fix : when we edit a membership and change its membership type - instead of 'change membership type' activity, 'change membership status' activity was getting recorded

fix Contribution Aggregate by Relationship report

Webtest fixes

fixed contribute PCP webtest

WebTest_Profile_MultiRecordProfileAddTest webtest fix

fixes for --filter=testContributionPageSeparatePaymentPayLater WebTest_Contribute_ContributionPageAddTest

CRM-12845 CRM_Utils_Migrate - Handle CustomGroup subtypes

CRM-13201, fixed profile search

----------------------------------------
* CRM-13201: Add alterTemplateFile hook
  http://issues.civicrm.org/jira/browse/CRM-13201

CRM_Event_Page_ManageEvent - Fix static warning

Profile web test fixes.

Also: Preventively fix bad cache logic

CRM-12892 - CRM/Form/validate.tpl - Clarify error about date formatting

----------------------------------------
* CRM-12892: CiviHR - Entity - Job Positions & Roles
  http://issues.civicrm.org/jira/browse/CRM-12892

Also: Fix loading of custom error messages

----------------------------------------
* CRM-12892: CiviHR - Entity - Job Positions & Roles
  http://issues.civicrm.org/jira/browse/CRM-12892

CRM-13220, event were not listed in ical/html feed due to ACL caching bug

Tested HTML, rss and ical listings including w/ event type filter (type=N). Note that I did NOT test if the functionality implemented by Adam Wight which caused this regression is affected by these changes.

Remove extraneous period in activity postProcess status msg

Conflicts:
	CRM/Contribute/PseudoConstant.php
	CRM/Upgrade/Incremental/php/FourThree.php

Webtest fixes