gcc fix.
Merge branch 'master' of https://github.com/dalerank/opencaesar3

Conflicts:
	oc3_advisor_employers_window.cpp
	oc3_advisor_finance_window.cpp
	oc3_astarpathfinding.cpp
	oc3_cityfunds.cpp
	oc3_factory_building.cpp
	oc3_filepath.cpp
	oc3_goodstore.cpp
	oc3_goodstore.hpp
	oc3_granary.cpp
	oc3_groupbox.cpp
	oc3_json.cpp
Remove obsolete files