Fix #31

Conflicts:
	src/hosting/battleroomtab.cpp
clean up last commit