small fixes
small fixes
Merge branch 'master' of https://github.com/gecube/opencaesar3 into vs2008-added

Conflicts:
	oc3_guienv.cpp : resolved
	oc3_label.cpp : resolved
	oc3_label.hpp : resolved
	oc3_screen_game.cpp : resolved
	oc3_topmenu.cpp : resolved
	oc3_topmenu.hpp : resolved