CRM-13840 Edit button not showing when viewing Contact record
Merge pull request #2100 from kenwest/CRM-13840

CRM-13840
CRM-13744 permissions allow 'or' permissions - prevents regression on event registration under some circumstances

----------------------------------------
* CRM-13744: cid=0 contribution & event form autocompletes not working for people with *only* access ajax api
  http://issues.civicrm.org/jira/browse/CRM-13744
Merge pull request #2102 from eileenmcnaughton/CRM-13744

CRM-13744 permissions allow 'or' permissions - prevents regression on ev...