code define by  zchao
Merge remote-tracking branch 'origin/master'

Conflicts:
	module/action/ExtFinanceAction.class.php
	module/action/SaveSalaryAction.class.php