ContactMine and Explosion almost finished
Merge remote-tracking branch 'origin/master'
Contact Mine optimated
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Test mit ServerPlayer
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
ServerMine und Explosion
Merge branch 'master' of https://github.com/hottehead/GameDevWeek.git

Conflicts:
	gdx-bunny-brawl/src/main/java/de/hochschuletrier/gdw/ws1314/entity/EntityStates.java
	gdx-bunny-brawl/src/main/java/de/hochschuletrier/gdw/ws1314/entity/player/ServerPlayer.java
Merge remote-tracking branch 'origin/master'

Conflicts:
	gdx-bunny-brawl/src/main/java/de/hochschuletrier/gdw/ws1314/states/DualGamePlayState.java
DamageApply
DamageApply
Merge remote-tracking branch 'origin/master'
Kontaktmiene optimiert
Merge remote-tracking branch 'origin/master'

Conflicts:
	gdx-bunny-brawl/src/main/java/de/hochschuletrier/gdw/ws1314/game/LevelLoader.java
ContactMine almost finished
Merge remote-tracking branch 'origin/master'

Conflicts:
	gdx-bunny-brawl/src/main/java/de/hochschuletrier/gdw/ws1314/entity/player/ServerPlayer.java