Minor bugfixes
Merge branch 'master' of github.com:rmatil/cms

* 'master' of github.com:rmatil/cms:
  Update LICENSE.md
  Create LICENSE.md