generic content types
Merge branch 'master' of github.com:captain-lucas/clear_cms