ui improvement
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	src/org/imagine/screensframework/MainWindowController.java
eczfrz