updates
Merge branch 'development' of https://github.com/quibstar/cheetah-CMS into development