Committing changes from non-tracked place
fixed compilation error
Merge branch 'nontrackedversion'

Conflicts:
	client.cpp
	client.h
	game.cpp
	netconnectdlg.cpp
	screen.cpp