Merge branch 'new-design'
Merge branch 'master' of https://github.com/thesadboy/secms