fixed conflicts of the merge
Merge branch 'master' of github.com:royalpioneers/Retailer2