More model stuff
Merge branch 'master' of https://github.com/felixmc/CMS-Rest-API