More Settings stuff
Merge branch 'master' of https://github.com/swi88/YourClubMusic

Conflicts:
	res/values/strings.xml