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
Merge branch 'master' into physik-master

Conflicts:
	gdx-test/src/main/java/de/hochschuletrier/gdw/ss14/sandbox/Test/System/MovementSystem.java
some clean um in test
Merge branch 'master' of https://github.com/Lusito/GameDevWeek into physik-master
some clean up in kitten rescue
Merge branch 'master' of https://github.com/Lusito/GameDevWeek into physik-master

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

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

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