Merge commit, GameSettings added
Merge branch 'input' of https://github.com/Lusito/GameDevWeek into input

Conflicts:
	gdx-test/src/main/java/de/hochschuletrier/gdw/ss14/input/InputDevice.java
	gdx-test/src/main/java/de/hochschuletrier/gdw/ss14/input/InputManager.java
GeneralInputAdapter removed