Added EntityFactory to Game.java
Merge branch 'master' of https://github.com/Lusito/GameDevWeek.git
Added usage of generateCat in Game.java
Merge branch 'master' of https://github.com/Lusito/GameDevWeek.git
cat should have animations ... more or less ...
Merge branch 'master' of https://github.com/Lusito/GameDevWeek

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

Conflicts:
	gdx-kitten-rescue/src/main/java/de/hochschuletrier/gdw/ss14/ecs/EntityFactory.java
Merge branch 'master' of https://github.com/Lusito/GameDevWeek
Bad JSON
Merge branch 'master' of https://github.com/Lusito/GameDevWeek
Added redTinted shader.
Merge branch 'master' of https://github.com/Lusito/GameDevWeek.git
Merge branch 'master' into physik-master