gd
Merge remote-tracking branch 'origin/master'

Conflicts:
	broZoneLayer/broZoneLayer/MainWindow.xaml.cs