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

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

app/controllers/application_controller.rb

@@ -277,11 +277,11 @@ class ApplicationController < ActionController::Base
 				end
 			end
 
-			# if !User.current.logged? && Rails.env.development?
-			# 	user = User.find 1
-			# 	User.current = user
-			# 	start_user_session(user)
-			# end
+			if !User.current.logged? && Rails.env.development?
+				user = User.find 1
+				User.current = user
+				start_user_session(user)
+			end
 
 
 			# 测试版前端需求