Fix indentation in lobby.xml
Merge commit '3e0a24a5cce2fd882ce0457783eefae32197b14f'

Conflicts:
	binaries/data/mods/public/gui/lobby/lobby.xml
Merge commit '437d755106cc8dd15a41037b8208b1417a538b73'

by JoshuaJB
Merge commit '4aeeea474b46b63e82b42037a58d36bc9a794792'

By JoshuJB
Fix incorrect map sizing, by JoshuaJB
More UI improvements, bu JoshuaJB
Add comment in config file for lobby.server and lobby.xpatamupp.
Additional UI improvements by JoshuaJB.
Upstream Merge