Online Shop: Changes for bug fixes
Merge branch 'master' of https://github.com/azizkap21/OnlineShop.git