Signed-off-by: AB <www.wpj@163.com>
Merge branch 'master' of github.com:Jitlee/WPFMonitor

Conflicts:
	WPFMonitor.DAL/WPFMonitor.DAL.csproj
	WPFMonitor.Library/Properties/AssemblyInfo.cs
	WPFMonitor.Model/WPFMonitor.Model.csproj
	WPFMonitor/MainWindow.xaml.cs
	WPFMonitor/WPFMonitor.csproj