Formating the game lobbies list
Fixed conflicts
Merge branch 'master' of https://github.com/Senior-Project-2013/Worphles

Conflicts:
	webui/css/custom/mainLobby.css
	webui/js/MainLobby.js