tried sth. out but deleted it again
Merge remote-tracking branch 'origin/TDIDialog' into TDIDialog

Conflicts:
	TDI/src/view/TDIDialog.java