--added price to the check out
--removed old activities
Merge branch 'develop' of https://github.com/ehis/SmartShop into develop