对一些maven的依赖项进行了修正
Merge branch 'master' of https://github.com/yidongnan/HUT

Conflicts:
	pom.xml
	src/main/java/com/hut/action/UserAction.java
	src/main/resources/applicationContext-common.xml
	src/test/java/com/michael/service/ClassServiceTest.java