加入配置相关
Merge branch 'master' of https://github.com/RyanYao123/cellcon

Conflicts:
	cellCon/MainWindow.xaml.cs
	cellCon/TestSer.xaml.cs