Hund folgt Katze
Merge branch 'master' of https://github.com/Lusito/GameDevWeek

Conflicts:
	gdx-test/src/main/java/de/hochschuletrier/gdw/ss14/sandbox/Test/Entity/EntityFactory.java