Added ShopAdditionalStockLocations to Web-Store and re-organize settings
Added ORDER BY clauses
Added ORDER BY clause
Merge branch 'develop' of github.com:KwaMoja/KwaMoja into develop
Merge branch 'develop' of github.com:KwaMoja/KwaMoja into develop
Merge pull request #162 from timschofield/develop

Develop