Merge branch 'develop' of github.com:timschofield/KwaMoja into develop
Merge pull request #165 from fahadhatib/develop

Develop
Merge branch 'develop' of github.com:KwaMoja/KwaMoja into develop
Check for demo mode before blocking user
Merge branch 'develop' of github.com:timschofield/KwaMoja into develop
Change the names of some variables
Change some variable names
Add in a style for required form elements
Added ShopShowLeftCategoryMenu Parameter for webSHOP
Restrict priority field to integers
Shop config changes
check contracts before deleting branches
Merge pull request #166 from timschofield/develop

Updates from webERP