Neu..
Merge branch 'master' of https://github.com/Sonni591/SW

Conflicts:
	ABCAnalyse/src/gui/PanelEinteilung.java