Fixing package.json
Merge branch 'master' into deploy

Conflicts:
	package.json