oops - fixes for client lobby network
Merge branch 'master' of http://github.com/rbellido/Project

Conflicts:
	redesigned/modules/client_network.cpp