Merge branch 'Develop' into client-windowsform

Conflicts:
	ClientWindow/App.config
	ClientWindow/Client.cs
	ClientWindow/ClientWindow.csproj
	ClientWindow/Form1.Designer.cs
	ClientWindow/Form1.cs
	ClientWindow/Program.cs
Merge branch 'Develop' of github.com:Chupsy/SpamStalker into Develop

Conflicts:
	FakeSmtp/MetaCommandAPI.cs
[ADD]

CreateUser
Merge branch 'Develop' of github.com:Chupsy/SpamStalker into Develop

Conflicts:
	FakeSmtp/User.cs
Fixxxxxaction