Bug fix und Verlagerung der Server und Client verbindung in die
vorherige State.
Merge branch 'master' of https://github.com/hottehead/GameDevWeek.git

Conflicts:
	gdx-bunny-brawl/src/main/java/de/hochschuletrier/gdw/ws1314/states/ServerLobbyState.java
Merge branch 'master' of https://github.com/hottehead/GameDevWeek.git