new style of content admin
Merge branch 'master' of github.com:iriahi/shelf-cms