Merge + Bug fixes
Merge branch 'master' of https://github.com/ChristofTorres/eShop.git