updata
Merge branch 'master' of github.com:momoplan/Game2
updata
updata
Merge branch 'master' of github.com:momoplan/Game2

Conflicts:
	src/com/chatgame/data/service/UserService.java