fix bug
Merge branch 'master' of github.com:lvsgame/shaco

Conflicts:
	service/service_game.c