Test
Shortcut
new settings control fot shortcuts
Display Shortcut in SettingsForm
Shortcuts and changelog on update
Merge branch 'origin/ShortcutKeys'

Conflicts:
	WSManager/WorkStationManager/Forms/ClientAdvanced/ClientAdvanced.Designer.vb