ARTIKEL: Weitere Internationalisierung; BeanVal
WTF checkout conflict

Merge branch 'dev-mario'

Conflicts:
	webshop/src/main/java/de/webshop/artikelverwaltung/domain/Artikel.java
Merge branch 'master' of https://github.com/dastdev/shop-repo.git