refactored
Merge branch 'master' of git@github.com:Agraphie/htwg.ebut.srck.git

Conflicts:
	WholesalerWebDemo/src/de/htwg_konstanz/ebus/wholesaler/action/ImportProductCatalogAction.java