Merge branch 'master' into overpass

diff --cc app/assets/javascripts/index.js
Simple merge

diff --cc app/assets/stylesheets/common.css.scss
Simple merge

diff --cc config/locales/en.yml
index 3e452571bbdbbc4425737feb4ea2937d9fa9aba9,fe5f58d512cd55d4c4996a68d7421c503c6cbedb..eb2991d4e1c96792c71b5060dadb493a514e9fc4
--- 1/config/locales/en.yml
--- 2/config/locales/en.yml
+++ b/config/locales/en.yml
@@@ -2108,11 -2102,9 +2109,11 @@@ en
        createnote_disabled_tooltip: Zoom in to add a note to the map
        map_notes_zoom_in_tooltip: Zoom in to see map notes
        map_data_zoom_in_tooltip: Zoom in to see map data
 +      queryfeature_tooltip: Query features
 +      queryfeature_disabled_tooltip: Zoom in to query features
      notes:
        new:
-         intro: "Spotted a mistake or something missing? Let other mappers know so we can fix it. Move the marker to the correct position and type a note to explain the problem. (Please don't enter personal information here.)"
+         intro: "Spotted a mistake or something missing? Let other mappers know so we can fix it. Move the marker to the correct position and type a note to explain the problem. (Please don't enter personal information or information from copyrighted maps or directory listings.)"
          add: Add Note
        show:
          anonymous_warning: This note includes comments from anonymous users which should be independently verified.

diff --cc config/routes.rb
Simple merge