Added contenttype to dm
Merge branch 'dev' into ms