Add functionality for client charges
Merge branch 'master' into add-client-charges-code
Finish ngContractorCalculator first pass