hmm, wtf was my last commit? XD some more stuff (cities fix, company has
list of settlements, updated uiskin). also i think i might have broken
this damn pdn file XD
Merge remote-tracking branch 'origin/master'

Conflicts:
	core/src/ch/digitalmeat/company/level/GameMap.java
	core/src/ch/digitalmeat/company/level/loader/LayerLoader.java
	core/src/ch/digitalmeat/company/level/loader/SettlementsLoader.java