SS3 updates

updated DataObjectDecorator and CMS fields to SS3 way
Merge pull request #2 from surfjedi/master

A few ss3 updates