msome chages in number picker area
Merge branch 'master' of https://github.com/ilantc/NeedARide

Conflicts:
	bin/AndroidManifest.xml
	res/values/strings.xml