Allow popups that are bound to markers to have new content set
include conditional before trying to set content of popup
Merge pull request #1373 from snkashis/marker_popups

Allow popups that are bound to markers to have new content set