-- CRM-12284
code reformatting CRM-11329
CRM-12321 - SqlGroupTest - Test prefetching more directly.

When multi-tier caching was introduced, testPrefetch regressed because it
relied on side-effects from having totally independent caches -- but the
multi-tier cache added extra, unforeseen sharing between SqlGroup instances.
In reality, prefetching works. This revision tests prefetch more directly
to workaround the changed assumptions.

----------------------------------------
* CRM-12321: Multi-tier caching causes multiple test regressions
  http://issues.civicrm.org/jira/browse/CRM-12321
Implement defaults and action equivalents for api perms CRM-11817
Add tools/scripts/merge-forward
Make it possible to hide the pref mail format in a buildForm hook (in the 'Page' tpl, we can hide it using CSS).
eliminate dead code, formatting fixes
List Pradeep as JMA staff, keep Web Access
Merge pull request #388 from JoeMurray/patch-1

List Pradeep as JMA staff, keep Web Access
Fix failure to recognize CamelCase entity names CRM-11817
triage api permissions CRM-11817
Merge pull request #387 from dlobo/MiscFixes

eliminate dead code, formatting fixes
Merge pull request #381 from totten/sqlgroup-prefetch

CRM-12321 - SqlGroupTest - Test prefetching more directly.
CRM-12274
CRM-12274
CRM-12274
Fix help encoding CRM-12324
Change permission for viewing a profile
Merge pull request #389 from colemanw/permissions

Triage API permissions
Update permissions.php

Explain how replace and delete permissions relate