Merge branch 'network/main' into network/replication
added setPosition method to VisualElement
arbeit an der kollision der levelobjects
Merge origin/master
debug graphics for sword
ServerPlayer aktualisiert
Merge remote-tracking branch 'origin/master'
started to implement the MainMenuStage
Merge branch 'master' of https://github.com/hottehead/GameDevWeek.git

Conflicts:
	gdx-bunny-brawl/src/main/java/de/hochschuletrier/gdw/ws1314/states/MainMenuState.java
anfaengliche LevelLoader Implementierung
Merge branch 'master' of https://github.com/hottehead/GameDevWeek
PlayerInfo Class removed!!!!!!!!!!!!!!!!!!!!
References updated.
# Implemented Egg drop
Debug ausgabe vergessen zu entfernen
Merge remote-tracking branch 'origin/master'
ausrasten!!!!
Merge branch 'integration_test/network_gameplay2' of https://github.com/hottehead/GameDevWeek.git into integration_test/network_gameplay2
.
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'