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

Conflicts:
	res/layout/activity_role_detail_info.xml