new pins
fix map autopan on infowindow show
conflic fixes and new pin