MyÄnderungen
Merge branch 'master' of https://github.com/ankaufma/EBUT.git

Conflicts:
	WholesalerWebDemo/WebContent/BMECat.xml