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

Conflicts:
	res/layout/finder_same_server_player.xml