去除 chat服务器，优化结构
Merge remote-tracking branch 'origin/master'

Conflicts:
	game-server/app.js