Signed-off-by: ritacc <ritacc@126.com>
Merge branch 'master' of github.com:Jitlee/WPFMonitor

Conflicts:
	WPFMonitor.Library/Other/CWLineProperty.xaml
	WPFMonitor/App.config

Signed-off-by: ritacc <ritacc@126.com>