Bonus Modules
Merge branch 'master' of github.com:SYSU-Jmiao/SYSUSalaryManagementSystem

Conflicts:
	src/com/sms/action/BonusAction.java
	src/com/sms/action/SpecialSalaryAction.java
Merge branch 'master' of github.com:SYSU-Jmiao/SYSUSalaryManagementSystem

Conflicts:
	src/com/sms/action/SpecialSalaryAction.java
Merge branch 'master' of github.com:SYSU-Jmiao/SYSUSalaryManagementSystem

Conflicts:
	WebContent/newWorkerSalary_daiqixin.jsp
	src/com/sms/action/BonusAction.java
	modified:   WebContent/remove.jsp

	modified:   WebContent/specialSalaryChange.jsp