Merge branch 'ConfigEditor' of https://github.com/Linancheng/MicroDAQ into ConfigEditor
Merge branch 'ConfigEditor' of https://github.com/Linancheng/MicroDAQ into ConfigEditor
Merge branch 'ConfigEditor' of https://github.com/Linancheng/MicroDAQ into ConfigEditor
修改程序的bug
Merge remote-tracking branch 'liufb/ConfigEditor' into ConfigEditor

Conflicts:
	ConfigEditor/MainForm.Designer.cs
	ConfigEditor/MainForm.resx