added new properties to each marker
fixed merg conflicts, add new properties to each marker