Merge pull request #1026 from yashodha/fixes

fix custom group error
fix bug in handling unique fields as a return value highlighted by test
CRM-12623

----------------------------------------
* CRM-12623: Create CiviHR Report Template
  http://issues.civicrm.org/jira/browse/CRM-12623
Merge pull request #1031 from deepak-srivastava/hr

CRM-12623
Merge pull request #1030 from eileenmcnaughton/master

fix api return bug highlighted by syntaxconformancetest
CRM-12864