updated package.json
trivial change
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/server/Injector/Configuration.js