修改排课日历插件
日历插件优化，验证优化
Merge branch 'feature/zhaoxl' of github.com:TeamMemZhaoXiaoLong/xmcrm into feature/zhaoxl

Conflicts:
	app/views/teachers/arrage_time.html.erb
解决冲突
解决冲突后遗症
Merge commit '37aeaf02a681969789dd060d56527c3ce36a3e4a' into feature/zhaoxl

Conflicts:
	app/controllers/home_controller.rb
	app/views/teachers/arrage_time.html.erb
不能删除Gemfile.lock Database
给cc看排课的记录
修改日历插件样式
用户管理和角色管理测试
课表部分完工
Merge branch 'feature/zhaoxl' into develop
Merge branch 'feature/teaching' into develop