new ui
Merge remote-tracking branch 'origin/master'

Conflicts:
	STmanager/frmMain.cs