重构代码
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/controllers/base_controller.rb
重构代码