Fix Maven Update in allen Projekten
Merge branch 'master' of https://github.com/hottehead/GameDevWeek
Particle Editor Starter Klasse
Merge branch 'master' of https://github.com/hottehead/GameDevWeek
Merge branch 'master' of https://github.com/hottehead/GameDevWeek
AssetManager liefert Bezeichner zu gegebenem Assettype

AssetManager liefert Liste aller Assets zu gegebenem Assettype
Merge branch 'master' of https://github.com/hottehead/GameDevWeek
Merge branch 'master' of https://github.com/hottehead/GameDevWeek
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
Merge branch 'master' of https://github.com/hottehead/GameDevWeek
added gameplay music
Laden der Map in die GamePreferences verlagert.
Finished-Game-State hinzugefügt (Alpha:P).
Some Fixes.
Jetzt wird auch die active property im switch genutzt um die bridge zu setzten.
Merge branch 'master' of https://github.com/hottehead/GameDevWeek
Refuse new connections when in-game.
Merge branch 'master' of ssh://git@github.com/hottehead/GameDevWeek.git
Merge remote-tracking branch 'origin/master'
Merge branch 'master' of https://github.com/hottehead/GameDevWeek.git

Conflicts:
	gdx-bunny-brawl/src/main/java/de/hochschuletrier/gdw/ws1314/states/DualGamePlayState.java