imports cleanup, formatting, Server sending
Merge branch 'Server'

Conflicts:
	TDI/src/model/ConfigLoader.java
	TDI/src/view/PluginTableModel.java
	TDI/src/view/TDIDialog.java
	TDI/test/model/ConfigLoaderTest.java