Merge commit '37aeaf02a681969789dd060d56527c3ce36a3e4a' into feature/zhaoxl

Conflicts:
	app/controllers/home_controller.rb
	app/views/teachers/arrage_time.html.erb
不能删除Gemfile.lock Database