Merge branch 'master' into feature/15
Merge branch 'feature/15' of github.com:webgme/webgme into feature/15
cleaning up ng-context-menu