maps...
Merge branch 'master' of https://github.com/ilantc/NeedARide

Conflicts:
	AndroidManifest.xml