Changed settings string back to original.
Changed settings string back to original.
Changed settings string back to original.
Merge remote-tracking branch 'master/master'

Conflicts:
	dogeweather/src/main/res/values/strings.xml
Edit to 'settings' string in values
Edit to 'settings' string in values