Merge pull request #505 from fahadhatib/develop

Remove references to webERP
Standardise file names and remove unnecessary $db_oc and $db
Bring code into line with coding style guidelines
Merge pull request #506 from timschofield/develop

Develop
Remove config file from tracking
Correction to .gitignore file
Merge pull request #507 from timschofield/develop

Develop