version 1.0
Merge branch 'master' of https://github.com/jameslin103/wms

Conflicts:
	WebRoot/WEB-INF/classes/cn/fm/service/salary/impl/EmployeesSalaryDetailServiceImpl.class
	WebRoot/WEB-INF/classes/cn/fm/web/action/salary/TaxOfPersonAction.class
	WebRoot/WEB-INF/classes/junit/test/company/EmployeesSalaryDetailServiceTest.class
	WebRoot/admin/tax-of-person.jsp
version 1.0