additions to master
Merge branch 'master' of https://github.com/eddies5/morpheus-web