Merge remote-tracking branch 'upstream/master' into routing-merge

Conflicts:
	app/assets/javascripts/index.js
	config/locales/en.yml

diff --cc app/assets/javascripts/index.js
index b89d6c71d55cf9e56b5d53a40fc788c5803e7d67,df975db48fe75b7690d5223cf6ecf894fcaff231..66dfa5b6fac3975a2c00daa6b651d76034303ef0
--- 1/app/assets/javascripts/index.js
--- 2/app/assets/javascripts/index.js
+++ b/app/assets/javascripts/index.js
@@@ -5,7 -5,7 +5,8 @@@
  //= require leaflet.key
  //= require leaflet.note
  //= require leaflet.share
 +//= require leaflet.polyline
+ //= require leaflet.query
  //= require index/search
  //= require index/browse
  //= require index/export
@@@ -13,11 -13,11 +14,12 @@@
  //= require index/history
  //= require index/note
  //= require index/new_note
 +//= require index/directions
  //= require index/changeset
+ //= require index/query
  //= require router
  
 -(function() {
 +$(document).ready(function () {
    var loaderTimeout;
  
    OSM.loadSidebarContent = function(path, callback) {

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

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

diff --cc config/locales/en.yml
index 7548833d855c2d62b4e9b2340247105eb7c80a15,87123f282b142baebbb598dade977624c9b06d9d..d2797511bec70a6de1a59c17394111d514aefc62
--- 1/config/locales/en.yml
--- 2/config/locales/en.yml
+++ b/config/locales/en.yml
@@@ -2151,40 -2150,13 +2156,47 @@@ en
          comment_and_resolve: Comment & Resolve
          comment: Comment
      edit_help: Move the map and zoom in on a location you want to edit, then click here.
 +    directions:
 +      engines:
 +        graphhopper_bicycle: "Bicycle (GraphHopper)"
 +        graphhopper_foot: "Foot (GraphHopper)"
 +        mapquest_bicycle: "Bicycle (MapQuest)"
 +        mapquest_car: "Car (MapQuest)"
 +        mapquest_foot: "Foot (MapQuest)"
 +        osrm_car: "Car (OSRM)"
 +      directions: "Directions"
 +      distance: "Distance"
 +      errors:
 +        no_route: "Couldn't find a route between those two places."
 +        no_place: "Sorry - couldn't find that place."
 +      instructions:
 +        continue_on: "Continue on "
 +        slight_right: "Slight right onto "
 +        turn_right: "Turn right onto "
 +        sharp_right: "Sharp right onto "
 +        uturn: "U-turn along "
 +        sharp_left: "Sharp left onto "
 +        turn_left: "Turn left onto "
 +        slight_left: "Slight left onto "
 +        via_point: "(via point) "
 +        follow:  "Follow "
 +        roundabout: "At roundabout take "
 +        leave_roundabout: "Leave roundabout - "
 +        stay_roundabout: "Stay on roundabout - "
 +        start: "Start at end of "
 +        destination: "Reach destination"
 +        against_oneway: "Go against one-way on "
 +        end_oneway: "End of one-way on "
 +        unnamed: "(unnamed)"
 +        courtesy: "Directions courtesy of %{link}"
 +      time: "Time"
+     query:
+       node: Node
+       way: Way
+       relation: Relation
+       nothing_found: No features found
+       error: "Error contacting %{server}: %{error}"
+       timeout: "Timeout contacting %{server}"
    redaction:
      edit:
        description: "Description"

diff --cc config/routes.rb
Simple merge