some changes in some files
Merge branch 'master' of https://github.com/ilantc/NeedARide

Conflicts:
	res/values/strings.xml