Merge remote-tracking branch 'origin/develop' into standalone_develop

# Conflicts:
#	app/views/users/get_user_info.json.jbuilder

config/routes.rb

@@ -86,6 +86,7 @@ Rails.application.routes.draw do
 
     resources :project_rank, only: [:index]
     resources :user_rank, only: [:index]
+    resources :nps, only: [:create]
 
     resources :statistic, only: [:index] do
       collection do
@@ -937,6 +938,9 @@ Rails.application.routes.draw do
       post :replace_image_url, on: :member
     end
     resources :faqs
+    resources :nps do
+      post :switch_change, on: :collection
+    end
     resources :laboratories, only: [:index, :create, :destroy, :update] do
       member do
         get :shixuns_for_select