add marker ability

add a list of markers to the map
Merge branch 'master' into markers