got current user location set
Merge branch 'map_current_location'