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
Create new location button fixes for event location
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
Fix the retrieveContact test fail on asserting relatiotionship for current
employer.

The test was checking for a relationship to an organization contact with an
ID of 1, but that was the ID of the individual contact record that's created
at the start of this test function. I've fixed this by explicitly creating an
organization contact and using that for the current employer relationship, so
we always know what the contact ID of the organization record will be.
Web Test Fix
Merge pull request #2943 from atif-shaikh/WebTextFix

WebText Fix related to Campain
Merge pull request #2942 from jitendrapurohit/Event_Webtests

Web Test Fix
Revert "Fix the retrieveContact test fail on asserting relatiotionship for current"

This reverts commit 900c5b9c341b8f5eeb346941da4ec891b02bb417.
Fix the retrieveContact test fail on asserting relatiotionship for current employer.

The test was checking for a relationship to an organization contact with an
ID of 1, but that was the ID of the individual contact record that's created
at the start of this test function. I've fixed this by explicitly creating a
organization contact and using that for the current employer relationship, so
we always know what the contact ID of the organization record will be.

This commit also adds a random string to the organization record's name to
ensure it's unique.
Merge pull request #2944 from giant-rabbit/feature/ContactTest-fix

Feature/contact test fix
Update qUnit api3 test
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