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

Conflicts:
	android/assets/pictures/cc-0_license.txt
	android/project.properties
	core/src/com/haw/projecthorse/assetmanager/AssetManager.java
AssetManager aktualisiert