Exporter
Merge branch 'master' of https://github.com/ankaufma/EBUT.git

Conflicts:
	WholesalerWebDemo/WebContent/WEB-INF/classes/de/htwg_konstanz/ebus/wholesaler/demo/ControllerServlet.class