minor
Merge branch 'master' of https://github.com/vfonte91/TaxiMap.git

Conflicts:
	res/values/strings.xml
minor