Hack: Removed shoppingcart.php to fix some branch-specific issues
Hack: Re-added shoppingcart.php to fix branch-specific issues
Merge remote-tracking branch 'origin/master' into simon-branch