T13
Merge branch 'master' of github.com:xbadcode/Rubezh

Conflicts:
	Projects/FireMonitor/Modules/SKDModule/TimeTrack/TimeTracking/ViewModels/ReportSettingsViewModel.cs
	Projects/FireMonitor/Modules/SKDModule/TimeTrack/TimeTracking/ViewModels/TimeTrackingViewModel.cs
	Projects/FireMonitor/Modules/SKDModule/TimeTrack/TimeTracking/Views/ReportSettingsView.xaml
Fix