Modified to show current user location
Merge remote-tracking branch 'origin/master'
Modified map view to show user current location