Alter config
Merge branch 'master' of github.com:royalpioneers/Retailer2
Fix conflicts
Fix conflicts
Merge branch 'master' of github.com:royalpioneers/Retailer2
Add search