BUGFIXES: payroll totals alignment, errors.
Merge branch 'master' into maps

Conflicts:
	payroll.php