Merge branch 'network/main' into network/replication
Fix Maven Snapshots update
Merge branch 'network/replication' of ssh://git@github.com/hottehead/GameDevWeek.git into network/replication
Merge branch 'master' into network/replication
Merge branch 'master' into network/replication
Merge branch 'master' into network/replication
Sinnloses / falsches TODO entfernt.
GameInfo-Erweiterungen und -Korrekturen.
Merge remote-tracking branch 'origin/network/replication' into network/replication
Implemented GameInfo replication.
Merge branch 'network/replication' of ssh://git@github.com/hottehead/GameDevWeek.git into network/replication
Merge branch 'master' into network/replication
arbeit am spieler
Merge remote-tracking branch 'origin/master'
more movement
Dying Entitys hinzugefuegt so das der Server nicht so viel mit animation timings zutun hat

Merge remote-tracking branch 'origin/master'

Conflicts:
	gdx-bunny-brawl/src/main/java/de/hochschuletrier/gdw/ws1314/entity/levelObjects/ClientLevelObject.java
	gdx-bunny-brawl/src/main/java/de/hochschuletrier/gdw/ws1314/entity/player/ClientPlayer.java
Merge remote-tracking branch 'origin/master'
Merge branch 'master' into network/replication
map01-map09 aktualisiert.
Merge branch 'master' of https://github.com/hottehead/GameDevWeek