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

Conflicts:
	src/main/java/bilkent/cs319/cargotycoon/game/GameViewController.java
	src/main/java/bilkent/cs319/cargotycoon/game/map/MapDatabase.java
	src/main/java/bilkent/cs319/cargotycoon/models/City.java
	src/main/java/bilkent/cs319/cargotycoon/models/PackageFactory.java