Remove some unused dependencies
Merge branch 'master' into ux

Conflicts:
	app.js
	package.json