shit fuck
update
Merge remote-tracking branch 'origin/master'

Conflicts:
	JPayroll/src/main/webapp/index.html
	JPayroll/src/main/webapp/ui/payroll/js/RuleEditorRow.js
	JPayroll/src/main/webapp/ui/payroll/pages/ruleConfig.view.js