Completed remove from shopping cart
Merge origin/working into working