Various changes.
Merge remote-tracking branch 'origin/testing' into testing

Conflicts:
	teo/teo/isgci/gui/ISGCIMainFrame.java