assets hin und her geschoben
Merge branch 'master' of github.com:Franjoo/Game

Conflicts:
	GameDemo-android/assets/data/spine/animations/Max_move-1.png
Merge branch 'master' of github.com:Franjoo/Game