Update strings.xml

correct gps
Update terms

Correct GPS
Merge branch 'master' of https://github.com/MklBst/app into MklBst-master

Conflicts:
	daydreaming/src/main/res/values/strings.xml
Merge branch 'MklBst-master' into develop