some improvements
Merge branch 'feature/73' of github.com:webgme/webgme into feature/73