BestellungMitGeschenkverpackung plus ValidationMessage
Merge branch 'master' of https://github.com/nigl1011/swa.git

Conflicts:
	shop/src/test/resources/ValidationMessages_en.properties