fix all
Merge branch 'master' of https://github.com/hackcode93/DLNU_MIS

Conflicts:
	.settings/org.eclipse.core.resources.prefs
	WebRoot/WEB-INF/classes/struts.xml
	WebRoot/login.jsp
	WebRoot/sql/college.sql
	WebRoot/sql/major.sql
	src/com/xeon/mis/action/AjaxAreaAction.java
	src/com/xeon/mis/action/AuthAction.java
	src/com/xeon/mis/action/CollegeAction.java
	src/com/xeon/mis/action/ConfirmUploadAction.java
	src/com/xeon/mis/action/MajorAction.java
	src/com/xeon/mis/action/UploadAction.java
	src/com/xeon/mis/dao/CollegeDao.java
	src/com/xeon/mis/dao/MajorDao.java
	src/com/xeon/mis/dao/NationDao.java
	src/com/xeon/mis/dao/StudentDao.java
	src/com/xeon/mis/filter/UserLoginFilter.java
	src/com/xeon/mis/model/Assistant.java
	src/com/xeon/mis/model/Class.java
	src/com/xeon/mis/model/College.java
	src/com/xeon/mis/model/Major.java
	src/com/xeon/mis/model/Manager.java
	src/com/xeon/mis/test/Test.java
	src/com/xeon/mis/utils/ExcelUtils.java
	src/struts.xml