fixed shopping cart
fixed shopping cart
resync
Merge branch 'harvey'
fixed shopping car