Merge branch 'gh-pages'
Switch highlight to circleMarker
Merge branch 'master' into gh-pages