Merge branch 'gui' of github.com:crtget/MAClient into crtget-gui

Conflicts:
	frmConfig.Designer.cs
	frmConfig.cs
Merge branch 'gui' of github.com:crtget/MAClient into gui

Conflicts:
	frmConfig.Designer.cs
	frmConfig.cs
Merge branch 'crtget-gui' into gui

Conflicts:
	frmConfig.Designer.cs
fix