fixed fading
Merge branch 'master' into sound

Conflicts:
	gdx-bunny-brawl/src/main/java/de/hochschuletrier/gdw/ws1314/states/DualGamePlayState.java
Merge branch 'master' into sound
added gameplay music
Eier werden 10 Sekunden nachdem sie ins Nest gelegt wurden despawned und dem entsprechenden Team angerechnet.
Merge origin/master
Fixes some disconnect stuff.
searched for issue for 3 hours, did nothing
Merge branch 'sound'
Merge branch 'master' of https://github.com/hottehead/GameDevWeek
Merge branch 'network/commands'
Merge branch 'master' of https://github.com/hottehead/GameDevWeek
arbeit am player
Merge remote-tracking branch 'origin/master'
winwin map updated and added to json
Merge branch 'master' of https://github.com/hottehead/GameDevWeek.git
balancing der kollision vom spieler
Merge remote-tracking branch 'origin/master'
Server Bridges jetzt aber richtig!
Merge remote-tracking branch 'origin/master'