Extended shopping cart functionality with edit/remove.
Merge remote-tracking branch 'origin/master'