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

Conflicts:
	src/com/chatgame/activity/finder/FriendDynamicActivity.java
	src/com/chatgame/activity/finder/RankingHonorActivity.java
	src/com/chatgame/activity/personalCenter/MyDynamicDetailActivity.java
	src/com/chatgame/activity/personalCenter/PublishDynamicActivity.java
	src/com/chatgame/activity/personalCenter/TitleInfoActivity.java