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

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

Conflicts:
	src/com/chatgame/activity/personalCenter/SelectFriendActivity.java
	src/com/chatgame/adapter/SelectFriendForShareAdapter.java