----------------------------------------
* CRM-12332: Strict warning when adding a new member
  http://issues.civicrm.org/jira/browse/CRM-12332

 CRM-12330 - Caching bugs in api setting code

-- CRM-12328 testcase

interim commit setting test passing but regression on api test

fix setting test to only call create if required

add a bit more assertation description on test

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