artikel id suche erledigt
Merge remote-tracking branch 'origin/master'

Conflicts:
	shop/src/main/resources/de/shop/messages_de.properties
	shop/src/main/resources/de/shop/messages_en.properties
merge