Merge pull request #496 from timschofield/develop

Merge pull request #10 from KwaMoja/develop
Merge pull request #497 from timschofield/develop

Develop
Merge pull request #498 from timschofield/develop

Remove dbugging code accidentally left in
Merge pull request #499 from timschofield/develop

Develop
Remove references to webERP
Merge pull request #500 from fahadhatib/develop

Remove references to webERP