commiting and failsafe corrected - still under heavy testing
Merge branch 'master' of https://github.com/webgme/webgme