Merge pull request #142 from ozone-development/feature-contentTypeUpdate

/System and /User loading as per documents
Merge branch 'master' into feature-contentTypeUpdate