commit
Merge branch 'development' of https://github.com/yuxxxx/AkaneMail

Conflicts:
	AkaneMail/AkaneMail/Form1.cs
	AkaneMail/AkaneMail/Form3.Designer.cs
	AkaneMail/AkaneMail/Form3.cs
commit
Merge branch 'master' into development

Conflicts:
	AkaneMail/AkaneMail/Form1.cs
	AkaneMail/AkaneMail/Form3.cs