Merge remote-tracking branch 'origin/simon-branch' into fraenzi-branch

Conflicts:
	Webshop/webroot/checkout.php
updated css for main page
Merge remote-tracking branch 'origin/fraenzi-branch' into simon-branch

Conflicts:
	Webshop/webroot/checkout.php