11chenxidi
Merge branch 'master' of https://github.com/SYSU-Jmiao/SYSUSalaryManagementSystem

Conflicts:
	WebContent/left.jsp
	WebContent/newWorkerSalary_daiqixin.jsp
Merge branch 'master' of https://github.com/SYSU-Jmiao/SYSUSalaryManagementSystem

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