Added popup
Fixed icon anchor
Merge branch 'map_marker'