fixed bugs with master. upadted all data correctly. handles types correctly
added try/catch. fixed bugs
Merge branch 'master' of https://github.com/eddies5/morpheus-web