Merge branch 'master' of https://github.com/tracertong/opencaesar3

Conflicts:
	oc3_building.cpp : resolved
	oc3_building_data.cpp : resolved
	oc3_gui_info_box.cpp : resolved
	oc3_menu.cpp : resolved
Merge pull request #121 from dalerank/master

Get changes from tracertong
Should be up to date now