Schoenere Einruekung
Merge branch 'master' of https://github.com/hottehead/GameDevWeek
Merge branch 'master' of https://github.com/hottehead/GameDevWeek
Haybale und State changes eingefuegt
Merge remote-tracking branch 'origin/master'

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