Merge remote-tracking branch 'gooru/master'
Merge pull request #506 from cyrilraja/master

CORE-1511 API Tweak required in Get Active Members for Class API
Made Changes pertaining to task DO-5232
Merge pull request #507 from saravanab/master

Made Changes pertaining to task DO-5232
Column family custom_fields_group added
Merge pull request #508 from rishwanthavr/master

Column family custom_fields_group added
*Fixed DO-4885 collection count in popup is not correct