Replace native sidebar close with bootstrap btn
Clear highlight when map clicked not modal closed
Merge branch 'master' into gh-pages