Merge remote-tracking branch 'konto/master'

Conflicts:
	MailChimpMailSender/MailChimpSender.cs
	TestApp/MainClass.cs
merge