stringlogin

Edited string and login
Merge remote-tracking branch 'origin/master'

Conflicts:
	PublicSafetyHack/res/values/strings.xml
Merge branch 'master' of https://github.com/RachaelJaggers/PublicSafetyHack

Conflicts:
	PublicSafetyHack/res/values/strings.xml