Merge remote-tracking branch 'upstream/pull/5536'

diff --combined config/routes.rb
index 84e5e861947075ad2af5f7f77aea6ea0c37f1d27,6e5e73855c34a23e7931042703e2b3e503ff5fb1..19dfc9a7729519c26285160ff1d3d68a36c157c7
--- 1/config/routes.rb
--- 2/config/routes.rb
+++ b/config/routes.rb
@@@ -62,11 -62,11 +62,11 @@@ OpenStreetMap::Application.routes.draw 
      put "relation/:id" => "relations#update", :id => /\d+/
      delete "relation/:id" => "relations#delete", :id => /\d+/
      get "relations" => "relations#index"
 -
 -    get "map" => "map#index"
    end
  
    namespace :api, :path => "api/0.6" do
 +    resource :map, :only => :show
 +
      resources :tracepoints, :path => "trackpoints", :only => :index
  
      resources :users, :only => :index
@@@ -322,10 -322,11 +322,11 @@@
  
    # messages
    resources :messages, :path_names => { :new => "new/:display_name" }, :id => /\d+/, :only => [:new, :create, :show, :destroy] do
-     post :mark
-     patch :unmute
- 
-     resource :reply, :module => :messages, :path_names => { :new => "new" }, :only => :new
+     scope :module => :messages do
+       resource :reply, :path_names => { :new => "new" }, :only => :new
+       resource :read_mark, :only => [:create, :destroy]
+       resource :mute, :only => :destroy
+     end
    end
    namespace :messages, :path => "/messages" do
      resource :inbox, :only => :show