Test Branch für CityButtons
Merge branch 'master' into CityButtonTest

Conflicts:
	core/src/com/haw/projecthorse/assetmanager/AssetManager.java
	core/src/com/haw/projecthorse/level/city/city.java
Simplify GameObject API
ImageTextButton im CityMenü
Merge branch 'master' into CityButtonTest
Merge branch 'master' into CityButtonTest

Conflicts:
	core/src/com/haw/projecthorse/level/city/city.java
	core/src/com/haw/projecthorse/level/worldmap/WorldMap.java
City Level Anpassungen
City Buttons Aktualisiert