xml
unveränderte pom.xml
Merge branch 'master' of https://github.com/krbe1015/shop.git

Conflicts:
	shop-maven/src/main/webapp/WEB-INF/beans.xml