Clear highlight when featureModal is closed
Merge branch 'master' into gh-pages