Update as of feb 27
Merge branch 'master' of https://github.com/polgass/simple_cms