fixes #96
Merge branch 'master' of https://github.com/webgme/webgme
Merge remote-tracking branch 'origin/master' into gme-service