kleine Änderung
Merge branch 'master' of https://github.com/Pasukaru/Weinverwaltung

Conflicts:
	bin/gui/window/edit/EditWindow.class
	src/gui/window/edit/EditWindow.java