Merge branch 'master' of https://github.com/tankhiwale/openstreetmap-website

diff --combined config/routes.rb
index 2c904fc48822826308989b433986434f3839968f,d936072d78e7cee4b6d2e12841671c8c14bff41a..6764335d6635bb6508d2d6f113a7330fda39cc80
--- 1/config/routes.rb
--- 2/config/routes.rb
+++ b/config/routes.rb
@@@ -67,11 -67,11 +67,11 @@@ OpenStreetMap::Application.routes.draw 
      get "user/gpx_files" => "api/users#gpx_files"
      get "users" => "api/users#index", :as => :api_users
  
-     get "user/preferences" => "api/user_preferences#read"
-     get "user/preferences/:preference_key" => "api/user_preferences#read_one"
-     put "user/preferences" => "api/user_preferences#update"
-     put "user/preferences/:preference_key" => "api/user_preferences#update_one"
-     delete "user/preferences/:preference_key" => "api/user_preferences#delete_one"
+     get "user/preferences" => "api/user_preferences#index"
+     get "user/preferences/:preference_key" => "api/user_preferences#show"
+     put "user/preferences" => "api/user_preferences#update_all"
+     put "user/preferences/:preference_key" => "api/user_preferences#update"
+     delete "user/preferences/:preference_key" => "api/user_preferences#destroy"
  
      post "gpx/create" => "api/traces#create"
      get "gpx/:id" => "api/traces#show", :id => /\d+/
@@@ -146,7 -146,6 +146,7 @@@
    get "/welcome" => "site#welcome"
    get "/fixthemap" => "site#fixthemap"
    get "/help" => "site#help"
 +  get "/about/:about_locale" => "site#about"
    get "/about" => "site#about"
    get "/history" => "changesets#index"
    get "/history/feed" => "changesets#feed", :defaults => { :format => :atom }