Added the map-in-between (updates #92)
Merge pull request #137 from ZeusWPI/android/map-activity-location

Added the map-in-between (updates #92)