Merge pull request #166 from timschofield/develop

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

ShopParamters.php changed vble name to avoid conflict
More client side form checking
Merge pull request #168 from fahadhatib/develop

More client side form checking