Feature/infowindow

Merging in feature click code that is now running on production.