Sort changes and other random stuff
Merge branch 'master' of https://github.com/hail2skins/cms
Merge branch 'master' of https://github.com/hail2skins/cms