changes at sliding and cat laser detection
Merge branch 'master' of https://github.com/Lusito/GameDevWeek into physik-master
cat and laserpointer stuff
Merge branch 'master' of https://github.com/Lusito/GameDevWeek into
physik-master
whitespace merge in EntityFactory.java please check for errors

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