david
Merge remote-tracking branch 'origin/master'

Conflicts:
	Mova.UI/MainWindow.xaml
	Mova.UI/MainWindow.xaml.cs