modified:   build/classes/config/struts-user.xml
Merge branch 'master' of github.com:SYSU-Jmiao/SYSUSalaryManagementSystem

Conflicts:
	src/com/sms/action/BonusAction.java