mappers
Merge branch 'artikel'

Conflicts:
	shop/src/main/java/shop/util/rest/Messages.java