version fixes

Add tools/scripts/merge-forward

CRM-12328 switched references to group object for add_to_group_id and ad...

----------------------------------------
* CRM-12328: Profiles: "Add new contacts to group" AND "Include reCaptcha" settings are broken in profile forms
  http://issues.civicrm.org/jira/browse/CRM-12328

update generated data

Update distmaker for Sponsors -> CONTRIBUTORS

update CONTRIBUTORS

update version.xml

Explain how replace and delete permissions relate

Triage API permissions

CRM-12321 - SqlGroupTest - Test prefetching more directly.

eliminate dead code, formatting fixes

CRM-12321 - Revert BAO_Cache changes

This reverts commit d9d00494.

This reverts commit 33318c71.

Sponsor fixes

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

rearrange contributors list, add companies

rearrange contributors list, add companies

fix for api note test - affects where schema does not define unique field