Change server update to 15ms
Merge branch 'master' of github.com:beckbaibai/pvt

Conflicts:
	shared/game.shared.state.js