Merge branch 'JinisTest' into physik-master
Merge branch 'master' into physik-master
Merge branch 'master' into physik-master
Merge branch 'master' into physik-master
Merge branch 'master' of https://github.com/Lusito/GameDevWeek into physik-master
Merge branch 'master' into physik-master
removed some system.out.println's
Merge branch 'master' into physik-master
Merge branch 'master' into physik-master
Updated map. inserted floor flags, inserted  starting point
Merge branch 'master' of https://github.com/Lusito/GameDevWeek
Merge branch 'master' of https://github.com/Lusito/GameDevWeek
Merge branch 'master' of https://github.com/Lusito/GameDevWeek
Another Testmap. ( old one, which should work now)
Test
Test
Merge branch 'master' of https://github.com/Lusito/GameDevWeek

Conflicts:
	gdx-kitten-rescue/src/main/java/de/hochschuletrier/gdw/ss14/ecs/components/ConePhysicsComponent.java
	gdx-kitten-rescue/src/main/java/de/hochschuletrier/gdw/ss14/sandbox/Test/Spielwelt.java
	gdx-kitten-rescue/src/main/java/de/hochschuletrier/gdw/ss14/sandbox/Test/Test.java
Merge branch 'master' of https://github.com/Lusito/GameDevWeek
merge commit
Cat spawn position fixed.
Camera zoom resetted to 1.0