cityview
Merge branch 'master' of https://github.com/cfirtina/cargotycoon

Conflicts:
	src/main/java/bilkent/cs319/cargotycoon/game/city/CityViewController.java