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

Updated contentTypes
Changed system api data loading to map user to /user and system to /system
Merge branch 'master' of github.com:ozone-development/ozp-iwc into feature-contentTypeUpdate