improved error handling and fixed some bugs
Merge branch 'master' of https://github.com/webgme/webgme-turbulence

Conflicts:
	Turbulence/Turbulence.js