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

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