commit
commit
Merge branch 'Development-DRIVERPAYMENTS' of https://github.com/e9-dbeech/Cab9 into Deployment-TEST

Conflicts:
	invoicing/InvoiceModule.js
	invoicing/partials/invoice-table.html
	master/Cab9.Master
commit
commit
Merge branch 'Development-DRIVERPAYMENTS' of https://github.com/e9-dbeech/Cab9 into Deployment-TEST

Conflicts:
	Model/Invoice.cs
	drivers/payments/partials/create-driver-payment.html
after merge fixes