Merge remote-tracking branch 'origin/master'

Conflicts:
	Server/Client/Form1.Designer.cs
	Server/Client/Form1.cs
	Server/Client/Program.cs
	Server/Client/Properties/AssemblyInfo.cs
	Server/Client/Properties/Resources.Designer.cs
	Server/Client/Properties/Settings.Designer.cs

test