Kategorieauswahl ergänzt
Merge remote-tracking branch 'origin/master'

Conflicts:
	shop/src/main/webapp/WEB-INF/templates/desktop/nav.xml
Merge branch 'master' of https://github.com/markusklein/swa07.git
Merge branch 'master' of https://github.com/markusklein/swa07.git
Merge branch 'master' of https://github.com/markusklein/swa07.git
Artikel anlegen