Merge branch 'master' into live

config/routes.rb

@@ -15,6 +15,8 @@ Rails.application.routes.draw do
   match 'signup/:step', to: 'signup#steps', as: :signup_steps, via: [:get, :post]
   post 'signup_validate', to: 'signup#validate'
 
+  get 'privacy', to: 'pages#privacy', as: :privacy_page
+  get 'tos',     to: 'pages#tos',     as: :tos_page
 
   get "users/:username/avatars/:hash", to: "avatars#show", as: :user_avatar
 
@@ -25,7 +27,7 @@ Rails.application.routes.draw do
         get 'confirm_btcpay'
       end
     end
-    get 'projects', to: 'projects#index'
+    get 'other', to: 'other#index'
   end
 
   resources :invitations, only: ['index', 'show', 'create', 'destroy']
@@ -95,12 +97,10 @@ Rails.application.routes.draw do
       end
     end
 
-    # post 'users/:username/invitations', to: 'users#create_invitations'
+    resources :donations
+    resources :editable_contents, except: ['destroy']
 
     get 'invitations', to: 'invitations#index'
-
-    resources :donations
-
     get 'lightning', to: 'lightning#index'
 
     namespace :app_catalog do