.iml-Dateien entfernt und .gitignore aktualisiert.
.iml-Dateien entfernt und .gitignore aktualisiert.
Added GameStateDatagram and related changes. GameStateDatagram hinzugefuegt.
Merge remote-tracking branch 'origin' into network/lobby

Conflicts:
	gdx-bunny-brawl/src/main/java/de/hochschuletrier/gdw/ws1314/game/ServerGame.java
Merge remote-tracking branch 'remotes/origin/network/main' into network/lobby
Action, Event, Despawn, Gamestatecallback
ActionDatagram & Callback angepasst, jetzt mit Enum statt int.
add gitconfig
Added missing logger-warning on unexpected Datagram.

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

Conflicts:
	gdx-bunny-brawl/src/main/java/de/hochschuletrier/gdw/ws1314/network/NetworkManager.java
	gdx-bunny-brawl/src/main/java/de/hochschuletrier/gdw/ws1314/network/ServerDatagramHandler.java