CRM-10164
CRM-12689
-- fixed for CRM-10983, prevent the generation of duplicate custom data.
CRM-12689
CRM-12490, towards issues raised by dgg

----------------------------------------
* CRM-12490: Add Soft Credit data to the Contribution Detail Report
  http://issues.civicrm.org/jira/browse/CRM-12490
Merge pull request #962 from deepak-srivastava/hr

CRM-12490, towards issues raised by dgg
CRM-10164 : more clean up
clean trailing spaces from tests folder in prep
Merge pull request #959 from yashodha/4.4

CRM-12689
CRM-12768 fix & document api option group creation on custom_field.create'
CRM-12768 fix side-problem where handling of 'return' param inconsistent
update examples
Merge pull request #965 from eileenmcnaughton/CRM-12768

Crm 12768 fix custom field option group handling
make ufgroup api tests & api enotice complian
Merge pull request #958 from pratik-joshi/CRM-10164

CRM-10164
-- CRM-12697 cleaned up the usage of removed civicrm_activity column source_contact_id
Merge pull request #967 from ravishnair/CRM-12682

-- CRM-12697 cleaned up the usage of removed civicrm_activity column source_contact_id
locblock test fix broken as it was 'taking advantage of' inconsistency in return param
Merge pull request #968 from eileenmcnaughton/master

CRM-12768 caused locblock test to fail
CRM-12768 custom_file api -default type to 'String' for clarity & enotice