Fixed inital quality / sound settings
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/de/sopamo/triangula/android/SettingsActivity.java