added default value ability for settings
commit problem
Merge branch 'master' of https://github.com/hottehead/GameDevWeek

Conflicts:
	gdx-bunny-brawl/src/main/java/de/hochschuletrier/gdw/ws1314/states/GameplayState.java
Merge branch 'master' of https://github.com/hottehead/GameDevWeek