More sensible design for example CMS
Merge branch 'master' of https://github.com/mmeyer2k/ronin.git