dont know what i've done
Merge branch 'master' of github.com:Lusito/GameDevWeek

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

Conflicts:
	gdx-kitten-rescue/src/main/java/de/hochschuletrier/gdw/ss14/ecs/EntityFactory.java