Updated moving
Merge remote branch 'origin/master'

Conflicts:
	Game Client/src/de/gymdon/inf1315/game/GameMechanics.java