# imported physixbody to game.java
commit
Merge remote-tracking branch 'origin/master'
Kleiner change wo der PhysixManager gesetzt wird für die Entity erstellung auf dem sever
impulse
update von der ServerEntity und test in ServerProjectile
guaranteed filename persistence
Merge branch 'sound'
clean merge
Merge remote-tracking branch 'origin/master'
Merge origin/master
.
.
update der beginContactMethode in der Klasse ServerProjectile
cleanup
Merge remote-tracking branch 'origin/master'
Merge branch 'master' of https://github.com/hottehead/GameDevWeek

Conflicts:
	gdx-bunny-brawl/src/main/java/de/hochschuletrier/gdw/ws1314/game/Game.java
json, the 100th
# Added player intention dispatch # Updated player intention, toggle
intentions changed to on/off # Updated Intention in ClientGame.java
Merge branch 'sound'