dedupe hooks to make custom rules manageable thru UI + a flip hook
let hook override autoFilp flag if required
remove trailing whitespace
CRM-14501 add contact to cache key to deal with inconsistent permissioning
Merge pull request #2925 from eileenmcnaughton/CRM-14501

CRM-14501 add contact to cache key to deal with inconsistent permissioning
typo fixes, CRM-14463

----------------------------------------
* CRM-14463: Custom address fields can't search by location type
  https://issues.civicrm.org/jira/browse/CRM-14463
Merge pull request #2929 from kurund/CRM-14463

typo fixes, CRM-14463
Change participant role to select2
Merge pull request #2945 from colemanw/participant

Change participant role to select2
Improve styling of forms
Add select2 to basic search
fix incorrect merge on  CRM-14389 membership api - add test for fix
api -membership -fix comments
Merge pull request #2947 from eileenmcnaughton/merge-fix

Merge fix - membership api - merged incorrectly from 4.4 to master
CRM-13764 - change all instances of Delete Members to Delete Memberships.

----------------------------------------
* CRM-13764:
  https://issues.civicrm.org/jira/browse/CRM-13764
Merge pull request #2948 from davecivicrm/CRM-13764

CRM-13764 - change all instances of Delete Members to Delete Memberships...
Fix help for separate PCP pane in add/edit contribution form.
Merge pull request #2949 from davecivicrm/CRM-13833

CRM-13833 - Fix help for separate PCP pane in add/edit contribution form.
CRM-14522 remove incorrect FK from message_template schema
comment block fixes