make all
Merge branch 'master' of http://github.com/Luvinahlc/StudentManager

Conflicts:
	StuManager/WebRoot/WEB-INF/classes/com/stuman/domain/Courseplan.class
	StuManager/WebRoot/WEB-INF/classes/com/stuman/domain/Student.class
	StuManager/WebRoot/WEB-INF/classes/com/stuman/web/jsf/bean/AcademicBean.class
	StuManager/WebRoot/WEB-INF/classes/com/stuman/web/jsf/bean/LoginBean.class
	StuManager/WebRoot/WEB-INF/classes/com/stuman/web/jsf/bean/SelectCourseBean.class
	StuManager/WebRoot/WEB-INF/classes/com/stuman/web/jsf/bean/StudentBean.class
	StuManager/WebRoot/admin_3infoquerystatistics.jsp
	StuManager/WebRoot/stu_3infolookandmodi.jsp
	StuManager/WebRoot/teacoursequery.jsp
	StuManager/src/com/stuman/web/jsf/bean/AcademicBean.java
	StuManager/src/com/stuman/web/jsf/bean/StudentBean.java