Updated package.json.
Merge branch 'final'

Conflicts:
	package.json