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

Conflicts:
	AndroidManifest.xml
	src/com/chatgame/activity/contacts/FriendsListActivity.java
	src/com/chatgame/activity/guide/GuideActivity.java
	src/com/chatgame/activity/guide/StartActivity.java
	src/com/chatgame/activity/login/LoginActivity.java
	src/com/chatgame/activity/message/ChatActivity.java
	src/com/chatgame/activity/message/FriendsRecommendActivity.java
	src/com/chatgame/activity/personalCenter/DynamicDetailActivity.java
	src/com/chatgame/activity/personalCenter/PersonalCenterActivity.java
	src/com/chatgame/activity/personalCenter/SettingActivity.java
	src/com/chatgame/adapter/ChattingListViewAdapter.java
	src/com/chatgame/application/MyApplication.java
	src/com/chatgame/common/AsyncTask/OpenAsyncTask.java
	src/com/chatgame/data/service/UserService.java
	src/com/chatgame/data/service/XmppService.java
Merge branch 'master' of github.com:momoplan/Game2

Conflicts:
	src/com/chatgame/activity/personalCenter/DynamicDetailActivity.java