Bugfix
Merge remote-tracking branch 'origin/master'

Conflicts:
	Muehle_Master/src/de/dhbw/muehle/gui/viewactions/GamePanelVA.java