Map displays the markers around the user position
Merge branch 'map-markers'