person
Merge remote-tracking branch 'origin/master'

Conflicts:
	Mova.UI/Views/MaGardeRobeView.xaml.cs