restructure
Merge remote-tracking branch 'origin/master' into rendering
animation and stuff
Merge remote-tracking branch 'origin/master' into rendering

Conflicts:
	gdx-bunny-brawl/src/main/java/de/hochschuletrier/gdw/ws1314/entity/player/ServerPlayer.java
bushes are no longer contactmines, healthbar value corrected