Merge branch 'pre_trustie_server' into trustie_server

config/routes.rb

@@ -816,7 +816,7 @@ Rails.application.routes.draw do
     resources :school_statistics, only: [:index] do
       get :contrast, on: :collection
     end
-
+    resources :organizations, only: [:index, :edit, :show, :destroy]
     resources :users, only: [:index, :edit, :update, :destroy] do
       member do
         post :reward_grade