Ability to add custom events on the infoWindow on demand.
Merge branch 'dev2' into dev3