configuration
Merge remote-tracking branch 'origin/master'

Conflicts:
	sources/Hosts.Server.WinForms/MainForm.cs