modify the academic
Merge branch 'master' of https://github.com/Luvinahlc/StudentManager
at night
Merge branch 'master' of https://github.com/Luvinahlc/StudentManager

Conflicts:
	StuManager/WebRoot/WEB-INF/classes/com/stuman/dao/AcademicDeanDAO.class
	StuManager/WebRoot/WEB-INF/classes/com/stuman/dao/SelectCourseDAO.class
	StuManager/WebRoot/WEB-INF/classes/com/stuman/dao/imp/AcademicDeanDAOImp.class
	StuManager/WebRoot/WEB-INF/classes/com/stuman/dao/imp/SelectCourseDAOImp.class
	StuManager/src/com/stuman/dao/AcademicDeanDAO.java
	StuManager/src/com/stuman/dao/CourseInfoDAO.java
	StuManager/src/com/stuman/dao/SelectCourseDAO.java
	StuManager/src/com/stuman/dao/imp/AcademicDeanDAOImp.java
	StuManager/src/com/stuman/dao/imp/CourseInfoDAOImp.java
	StuManager/src/com/stuman/dao/imp/SelectCourseDAOImp.java
	StuManager/src/com/stuman/web/jsf/bean/AcademicBean.java
	StuManager/src/com/stuman/web/jsf/bean/CourseBean.java
	StuManager/src/com/stuman/web/jsf/bean/CourseplanBean.java
	StuManager/src/com/stuman/web/jsf/bean/SelectCourseBean.java
	StuManager/src/com/stuman/web/jsf/bean/StudentBean.java
	StuManager/src/hibernate.cfg.xml