updated package.json
Merge remote-tracking branch 'origin/bj-1.1.0-beta-test-fix' into 1.1.0-beta

Conflicts:
	server/package.json