Fixed a couple Civic related bugs and Trade Screen code.
Merge branch 'master' of https://github.com/Nightinggale/Medieval_Tech

Conflicts:
	Assets/CvGameCoreDLL.dll