some changes
sfds
Merge branch 'master' of https://github.com/pakrym/PatrolControl

Conflicts:
	PatrolControl.Service/App_Data/PatrolControl.Service.Model.DatabaseContext.mdf
	PatrolControl.Service/App_Data/PatrolControl.Service.Model.DatabaseContext_log.ldf
	PatrolControl.UI/Screens/MapEditor/MapEditorScreenView.xaml.cs
Merge branch 'master' of https://github.com/pakrym/PatrolControl
Changes model update