Finished server selection (including bug)
Merge remote-tracking branch 'origin/master'

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