Payroll

Hi,

pull request to payroll branch will have changes done by you and others to the master branch in May... quite messy
pull request to master branch is more compact - only October, but I'm not sure you are ready to get payroll into the main branch... up to you