Merge branch 'master' into SMTP

Conflicts:
	EmailClient/EmailClient.v11.suo
	EmailClient/EmailClient/Form1.cs