Cleanup
Merge branch 'master' of github.com:pixelsnob/cms