Merge branch 'master' of https://github.com/CheeseSoftware/MasterBot

Conflicts:
	src/MasterBot/MainForm.Designer.cs