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

Conflicts:
	src/com/chatgame/activity/message/ChatActivity.java
	src/com/chatgame/activity/message/MessageListActivity.java
	src/com/chatgame/data/service/XmppService.java
	src/com/chatgame/utils/common/SendMsgToHandler.java
modify
modify
Merge branch 'master' of github.com:momoplan/Game2
modify
Merge branch 'master' of github.com:momoplan/Game2