map02
more stuff
working on lost sprites
eier wieder drin
Merge remote-tracking branch 'origin/master' into rendering

Conflicts:
	gdx-bunny-brawl/src/main/java/de/hochschuletrier/gdw/ws1314/game/ClientGame.java
	gdx-bunny-brawl/src/main/java/de/hochschuletrier/gdw/ws1314/game/ServerGame.java
syso out
Merge remote-tracking branch 'origin/master' into rendering