dealing with npm
Merge branch 'master' of https://github.com/webgme/webgme

Conflicts:
	package.json