adapted shopping cart
Merge remote-tracking branch 'origin/fraenzi-branch' into simon-branch

Conflicts:
	Webshop/webroot/header.php