Work on settings page
Merge remote-tracking branch 'origin/OrrBranch'

	modified:   PayBack/res/layout/activity_settings.xml
	modified:   PayBack/res/values/strings.xml