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

Conflicts:
	src/com/chatgame/data/service/FriendListService.java
update Merge branch 'master' of github.com:momoplan/Game2

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