version1----付振雄
付振雄
Merge branch 'master' of https://github.com/SYSU-Jmiao/SYSUSalaryManagementSystem

Conflicts:
	build/classes/.gitignore
	build/classes/config/applicationContext-common.xml
	build/classes/config/hibernate.cfg.xml
	src/com/sms/action/LoginAction.java
	src/com/sms/action/UserAction.java
	src/config/applicationContext-common.xml
	src/config/hibernate.cfg.xml