more world things
Merge branch 'master' of github.com:Lusito/GameDevWeek

Conflicts:
	gdx-kitten-rescue/src/main/java/de/hochschuletrier/gdw/ss14/ecs/EntityFactory.java
jump over deadzone
Merge branch 'master' of github.com:Lusito/GameDevWeek