Warenkorb
Merge branch 'master' of https://github.com/spti1011/swe.git

Conflicts:
	shop/src/main/webapp/WEB-INF/templates/desktop/nav.xml