carthoteque & timeTracking refactoring
Merge branch 'master' of github.com:xbadcode/Rubezh

Conflicts:
	Projects/FireMonitor/Modules/SKDModule/AdditionalColumns/ViewModels/AdditionalColumnTypesViewModel.cs
	Projects/FireMonitor/Modules/SKDModule/Departments/ViewModels/DepartmentsViewModel.cs
	Projects/FireMonitor/Modules/SKDModule/HR/Views/HRView.xaml
	Projects/FireMonitor/Modules/SKDModule/Positions/ViewModels/PositionsViewModel.cs
	Projects/FireMonitor/Modules/SKDModule/TimeTrack/Holidays/ViewModels/HolidaysViewModel.cs
	Projects/FireMonitor/Modules/SKDModule/TimeTrack/Intervals/ViewModels/DayIntervalsViewModel.cs
	Projects/FireMonitor/Modules/SKDModule/TimeTrack/ScheduleShemes/ViewModels/ScheduleSchemesViewModel.cs
	Projects/FireMonitor/Modules/SKDModule/TimeTrack/Shedules/ViewModels/SchedulesViewModel.cs
	Projects/FireMonitor/Modules/SKDModule/TimeTrack/Shedules/Views/SchedulesView.xaml
merge fix
merge fix