修改排课信息显示控制台
Merge branch 'master' of git://github.com/rankun203/OnlineTeach.git

Conflicts:
	OnlineTeach/WebContent/css/style.css
	OnlineTeach/WebContent/script/js_preview.js
	OnlineTeach/src/com/teachMng/onlineTeach/autoplan/AutoPlan.java
h
Merge branch 'master' of git://github.com/rankun203/OnlineTeach.git
移动js_preview.js到js.js