test
Revert "test"

This reverts commit 9138dfcdbce460a2758c77ec6948a36a1b941cb5.
Merge branch 'master' of https://github.com/hottehead/GameDevWeek.git
PhysiksTest
Merge remote-tracking branch 'origin/master'
test velocity capping
Playerinfo added
SchlammExperiment
Merge remote-tracking branch 'origin/master'

Conflicts:
	gdx-test/src/main/java/de/hochschuletrier/gdw/ws1314/game/Game.java
Merge remote-tracking branch 'origin/master'

Conflicts:
	gdx-test/src/main/java/de/hochschuletrier/gdw/ws1314/states/GameplayState.java
fix miniarena map
Merge branch 'master' of https://github.com/hottehead/GameDevWeek.git
PlayerInfo removed
update von der PhysixEntity klasse
Revert "update von der PhysixEntity klasse"

This reverts commit b25682f5eccbdd0af6cdf94a10a05f556b6abb32.
Merge origin/master
update von der PhysixEntity klasse
revert
Merge remote-tracking branch 'origin/master' into hud

Conflicts:
	gdx-test/src/main/java/de/hochschuletrier/gdw/ws1314/states/GameplayState.java
fixes