better support for custom markers and info boxes: allow user to override styleId and templateId
Merge branch 'master' into gh-pages