cleanup
Merge remote-tracking branch 'origin/master'

Conflicts:
	Game/src/progprak/gruppe53/game/GameLogic.java