格式不一致提交代码
Merge branch 'master' of git@github.com:momoplan/Game2
修改bug:注册个人信息页男女选项互斥,兑换码页兑换成功之后返回提示放弃兑换,分享给微信好友时照片模糊不清,岁数过大男女符号与岁数重叠,角色动态按时间倒序排列,注册时通讯录界面显示通讯录里边的名字.
Merge branch 'master' of git@github.com:momoplan/Game2
添加 离线评论和赞 功能
Merge branch 'master' of git@github.com:momoplan/Game2.git

Conflicts:
	AndroidManifest.xml
	src/com/chatgame/activity/finder/FriendCircleActivity.java
Merge branch 'WorldChannel'

Conflicts:
	src/com/chatgame/activity/message/MessageListActivity.java
Merge branch 'master' of git@github.com:momoplan/Game2.git

Conflicts:
	AndroidManifest.xml
	src/com/chatgame/activity/finder/FinderActivity.java
	src/com/chatgame/constants/Constants.java
	src/com/chatgame/data/service/HttpService.java
simple
世界频道