PassJournal.EnterTime not null, drop Phone, drop ScheduleZone.IsControl, drop Employee.Dismissed, holidaySettings, addColumn.IsInGrid, columnTypesVM, graphics addColumns
Merge branch 'master' of github.com:xbadcode/Rubezh

Conflicts:
	Projects/Common/SKDDriver/SKDDatabaseService/DataAccess/SKD.dbml
	Projects/Common/SKDDriver/SKDDatabaseService/DataAccess/SKD.dbml.layout
	Projects/Common/SKDDriver/SKDDatabaseService/DataAccess/SKD.designer.cs
	Projects/FireMonitor/Modules/SKDModule/Intervals/Holidays/Views/HolidaySettingsView.xaml
merge fix