lobby flow
Merge branch 'master' of github.com:dcsan/gyrohack

Conflicts:
	app/client/battle_lobby/battle_lobby.html