Manage cart functionality
Merge branch 'master' into shop_keeper