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

Conflicts:
	res/layout-1280x720/activity_role_detail_info.xml
	res/layout-320x240/activity_role_detail_info.xml
	res/layout-480x320/activity_role_detail_info.xml
	res/layout-960x540/activity_role_detail_info.xml
	res/layout/activity_role_detail_info.xml
update