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

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