Fix server bugs
Merge branch 'master' of github.com:beckbaibai/pvt

Conflicts:
	shared/game.shared.platform.js