Merge branch 'master' of https://github.com/ibcom/1blankspace

Conflicts:
	1blankspace.financial.payroll-2.0.0.js
payroll