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

Conflicts:
	src/com/chatgame/activity/personalCenter/RoleDetailInfoActivity.java
update Merge branch 'master' of github.com:momoplan/Game2

Conflicts:
	res/layout/top_detail_info.xml
Merge branch 'master' of github.com:momoplan/Game2
Merge branch 'master' of github.com:momoplan/Game2
update
update Merge branch 'master' of github.com:momoplan/Game2

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