PhysiksTest
Merge remote-tracking branch 'origin/master'
test velocity capping
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