--modified shopping cart
Merge branch 'develop' of https://github.com/ehis/SmartShop into develop