Update dependencies

Conflicts:
	package.json