Merge
Merge branch 'master' of https://github.com/PhilippGrulich/HAW-SE2-projecthorse

Conflicts:
	android/assets/pictures/city/city.atlas
	android/assets/pictures/city/city.png