Map markers.
Marker pngs.
Markers.
Fixed merge errors.
Markers.
Minor changes. Merged branch.