Newest commit
Merge branch 'TDIDialog'

Conflicts:
	TDI/src/view/TDIDialog.java