Merge branch 'feature/86' of https://github.com/webgme/webgme
Merge branch 'master' of https://github.com/webgme/webgme
Merge branch 'master' of https://github.com/webgme/webgme
trying a fix for [#89]
Merge branch 'master' of https://github.com/webgme/webgme
Merge branch 'feature/89' of https://github.com/webgme/webgme