Add missing npm dependencies

Conflicts:
	package.json
Merge remote-tracking branch 'origin/master' into deploy