Merge remote-tracking branch 'origin/chdrost'

Conflicts:
	src/interfaces/ClientVerwaltungInterface.java
	src/tafelserver/Testklasse.java
Merge remote-tracking branch 'origin/mbaeuml'
Benutzer editdialog hinzugefuegt
Errorlog main client
aenderungen