commit to branch1
Merge remote-tracking branch 'remotes/origin/Branch1'

Conflicts:
	WpfApplication1/WpfApplication1/MainWindow.xaml
	WpfApplication1/WpfApplication1/WpfApplication1.csproj