Konflikt Validation
Merge branch 'master' of https://github.com/gapa1015/shop-repo.git

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