next step of quasi-inheritance implemented
Merge branch 'master' of https://github.com/webgme/webgme
Merge branch 'master' of https://github.com/webgme/webgme
Merge branch 'master' of https://github.com/webgme/webgme
bugfix
Merge branch 'master' of https://github.com/webgme/webgme