beans geändert	
resource mentoren hilfe
Merge commit '9f503de18b0f07a8567250f81ce8b2b8bb32d3b6'

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