Updated License
Merge branch 'master' of https://github.com/jszym/PermanganateCMS