Test
Merge branch 'master' of https://github.com/Lusito/GameDevWeek

Conflicts:
	gdx-kitten-rescue/src/main/java/de/hochschuletrier/gdw/ss14/ecs/systems/DogInputSystem.java
	gdx-kitten-rescue/src/main/java/de/hochschuletrier/gdw/ss14/ecs/systems/MovementSystem.java
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
Test
Merge branch 'master' of https://github.com/Lusito/GameDevWeek

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/MovementSystem.java
Merge branch 'master' of https://github.com/Lusito/GameDevWeek

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