bestellung
Merge branch 'master' of https://github.com/wkrupchenko/swe2.git

Conflicts:
	shop/src/main/resources/de/shop/messages_de.properties
	shop/src/main/resources/de/shop/messages_en.properties
Merge branch 'master' of https://github.com/wkrupchenko/swe2.git