Search results to map popup
Merge branch 'master' into gh-pages
searching