Lobby (Server + Client) added
Merge branch 'network/replication' into
integration_test/network_gameplay

Conflicts:
	gdx-bunny-brawl/src/main/java/de/hochschuletrier/gdw/ws1314/network/NetworkManager.java
Merge remote-tracking branch 'origin/integration_test/network_gameplay' into integration_test/network_gameplay
Merge branch 'network/lobby' into integration_test/network_gameplay

Conflicts:
	gdx-bunny-brawl/src/main/java/de/hochschuletrier/gdw/ws1314/Main.java
	gdx-bunny-brawl/src/main/java/de/hochschuletrier/gdw/ws1314/network/NetworkManager.java
Merge branch 'master' into integration_test/network_gameplay
Schnittstelle für setPlayerEntityId.
Erste versuche Netzwerk code zu verwenden.
Lobby changed
GameplayState removed, because replaced by Server- and
ClientGameplayState
Console-State-Change to ServerGamePlayState added
Fix für Enum-Codierungs-Bug.
Merge branch 'integration_test/network_gameplay' of ssh://git@github.com/hottehead/GameDevWeek.git into integration_test/network_gameplay
Restored missing debug commands.
ConnectionAttachment got entityid
Merge branch 'network/lobby' into integration_test/network_gameplay

Conflicts:
	gdx-bunny-brawl/src/main/java/de/hochschuletrier/gdw/ws1314/network/NetworkManager.java
Merge branch 'network/action' into network/commands

Conflicts:
	gdx-bunny-brawl/src/main/java/de/hochschuletrier/gdw/ws1314/network/NetworkManager.java
Merge remote-tracking branch 'origin/integration_test/network_gameplay' into integration_test/network_gameplay
Merge remote-tracking branch 'origin/network/action' into network/commands

Conflicts:
	gdx-bunny-brawl/src/main/java/de/hochschuletrier/gdw/ws1314/network/NetworkManager.java
Added NetworkCommands and an catch in NetConnection. Was hinzugefügt.