Merge pull request #761 from viji-m/master

added support for collection settings
Merge pull request #762 from viji-m/master

more changes on content settings
more changes on content settings for update