try making some other stuff into PreferenceSwitchables
Merge remote-tracking branch 'durka/pref-cleanup' into develop

Conflicts:
	res/values/strings.xml
	res/xml/preferences.xml