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

Conflicts:
	WPFMonitor/WPFMonitor.csproj

Signed-off-by: AB <www.wpj@163.com>