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
Merge branch '4.4' into master

Conflicts:
	CRM/Core/BAO/CustomQuery.php