Hack: Removed shoppingcart.php to fix some branch-specific issues
Hack: Re-added shoppingcart.php to fix branch-specific issues
Do not ask me where this file comes from...
Merge remote-tracking branch 'origin/simon-branch'

Conflicts:
	Webshop/webroot/shoppingcart.php
Merge remote-tracking branch 'origin/master' into simon-branch