City Level Update mit Hintergrund
Merge branch 'master' of https://github.com/PhilippGrulich/HAW-SE2-projecthorse

Conflicts:
	core/src/com/haw/projecthorse/assetmanager/AssetManager.java
	core/src/com/haw/projecthorse/level/city/city.java
Merge branch 'master' of https://github.com/PhilippGrulich/HAW-SE2-projecthorse

Conflicts:
	core/src/com/haw/projecthorse/assetmanager/AssetManager.java
Merge branch 'master' of https://github.com/PhilippGrulich/HAW-SE2-projecthorse

Conflicts:
	android/assets/pictures/hamburg/hamburg.png
City Level

Conflicts:
	android/assets/pictures/hamburg/hamburg.png