niks
Merge remote-tracking branch 'refs/remotes/origin/master'

Conflicts:
	src/WpfApplication10/WpfApplication10/MainWindow.xaml.cs