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

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