catch up
Merge remote-tracking branch 'origin/master'

Conflicts:
	BarCode2/App.xaml.cs
	BarCode2/MainWindow.xaml.cs