Merge pull request #147 from timschofield/develop

Develop
Merge pull request #148 from timschofield/develop

Updates from webERP
Merge pull request #149 from timschofield/develop

Develop
Merge pull request #150 from timschofield/develop

Develop
Merge pull request #151 from timschofield/develop

Develop
Bring code into line with the coding guidelines
Merge pull request #152 from fahadhatib/develop

Bring code into line with the coding guidelines