precommit
Merge branch 'Release-1.0.4.441' of https://github.com/UGTU/Old-School into Release-1.0.4.441

Conflicts:
	UGTU/Domain/Classes/ConstantRepository.dcu
	UGTU/Domain/Controllers/CommonNagruzkaController.dcu
	UGTU/Domain/Controllers/FactNagruzkaController.dcu
	UGTU/Domain/Controllers/GeneralController.dcu
	UGTU/Domain/Controllers/NagruzkaDirectory.dcu
	UGTU/Domain/Controllers/PlanNagruzkaController.dcu
	UGTU/Domain/Controllers/PreparationNagruzkaController.dcu
	UGTU/Domain/Controllers/SheduleAccountController.dcu
	UGTU/Domain/Controllers/SheduleClasses.dcu
	UGTU/Domain/Controllers/SheduleConstraintController.dcu
	UGTU/Domain/Controllers/SheduleController.dcu
	UGTU/Domain/Controllers/SheduleGrids.dcu
	UGTU/Domain/Controllers/SheduleMainController.dcu
	UGTU/Domain/Interfaces/CommonIntf.dcu
	UGTU/Domain/Interfaces/DefImpl/CommonIntfImpl.dcu
	UGTU/Domain/Reports/N_DepsSemester.dcu
	UGTU/Domain/Reports/N_FactDeps.dcu
	UGTU/Domain/Reports/N_FactPrepodsExecute.dcu
	UGTU/Domain/Reports/N_FullDepsSemester.dcu
	UGTU/Domain/Reports/N_PFODeps.dcu
	UGTU/Domain/Reports/N_PlanDepsCompare.dcu
	UGTU/Domain/Reports/N_PlanDepsSemesters.dcu
	UGTU/Domain/Reports/N_YearsCommonComparison.dcu
	UGTU/Domain/Reports/N_YearsComparison.dcu
	UGTU/Domain/Reports/N_YearsStaffComparison.dcu
	UGTU/Utils/ExceptionBase.dcu
	UGTU/ugtu.dproj.local
	UGTU/ugtu.exe
	UGTU/ugtu.identcache
precommit
Merge branch 'Release-1.0.4.441' of https://github.com/UGTU/Old-School into Release-1.0.4.441

Conflicts:
	UGTU/Domain/Classes/ConstantRepository.dcu
	UGTU/Domain/Controllers/CommonNagruzkaController.dcu
	UGTU/Domain/Controllers/FactNagruzkaController.dcu
	UGTU/Domain/Controllers/GeneralController.dcu
	UGTU/Domain/Controllers/NagruzkaDirectory.dcu
	UGTU/Domain/Controllers/PlanNagruzkaController.dcu
	UGTU/Domain/Controllers/PreparationNagruzkaController.dcu
	UGTU/Domain/Controllers/SheduleAccountController.dcu
	UGTU/Domain/Controllers/SheduleClasses.dcu
	UGTU/Domain/Controllers/SheduleConstraintController.dcu
	UGTU/Domain/Controllers/SheduleController.dcu
	UGTU/Domain/Controllers/SheduleGrids.dcu
	UGTU/Domain/Controllers/SheduleMainController.dcu
	UGTU/Domain/Interfaces/CommonIntf.dcu
	UGTU/Domain/Interfaces/DefImpl/CommonIntfImpl.dcu
	UGTU/Domain/Reports/N_DepsSemester.dcu
	UGTU/Domain/Reports/N_FactDeps.dcu
	UGTU/Domain/Reports/N_FactPrepodsExecute.dcu
	UGTU/Domain/Reports/N_FullDepsSemester.dcu
	UGTU/Domain/Reports/N_PFODeps.dcu
	UGTU/Domain/Reports/N_PlanDepsCompare.dcu
	UGTU/Domain/Reports/N_PlanDepsSemesters.dcu
	UGTU/Domain/Reports/N_YearsCommonComparison.dcu
	UGTU/Domain/Reports/N_YearsComparison.dcu
	UGTU/Domain/Reports/N_YearsStaffComparison.dcu
	UGTU/Utils/ExceptionBase.dcu
	UGTU/reports/SprvPens.xlt
	UGTU/ugtu.exe
precommi
Merge branch 'Release-1.0.4.441' of https://github.com/UGTU/Old-School into Release-1.0.4.441

Conflicts:
	UGTU/Domain/Classes/ConstantRepository.dcu
	UGTU/Domain/Controllers/CommonNagruzkaController.dcu
	UGTU/Domain/Controllers/FactNagruzkaController.dcu
	UGTU/Domain/Controllers/GeneralController.dcu
	UGTU/Domain/Controllers/NagruzkaDirectory.dcu
	UGTU/Domain/Controllers/PlanNagruzkaController.dcu
	UGTU/Domain/Controllers/PreparationNagruzkaController.dcu
	UGTU/Domain/Controllers/SheduleAccountController.dcu
	UGTU/Domain/Controllers/SheduleClasses.dcu
	UGTU/Domain/Controllers/SheduleConstraintController.dcu
	UGTU/Domain/Controllers/SheduleController.dcu
	UGTU/Domain/Controllers/SheduleGrids.dcu
	UGTU/Domain/Controllers/SheduleMainController.dcu
	UGTU/Domain/Interfaces/CommonIntf.dcu
	UGTU/Domain/Interfaces/DefImpl/CommonIntfImpl.dcu
	UGTU/Domain/Reports/N_DepsSemester.dcu
	UGTU/Domain/Reports/N_FactDeps.dcu
	UGTU/Domain/Reports/N_FactPrepodsExecute.dcu
	UGTU/Domain/Reports/N_FullDepsSemester.dcu
	UGTU/Domain/Reports/N_PFODeps.dcu
	UGTU/Domain/Reports/N_PlanDepsCompare.dcu
	UGTU/Domain/Reports/N_PlanDepsSemesters.dcu
	UGTU/Domain/Reports/N_YearsCommonComparison.dcu
	UGTU/Domain/Reports/N_YearsComparison.dcu
	UGTU/Domain/Reports/N_YearsStaffComparison.dcu
	UGTU/Utils/ExceptionBase.dcu
	UGTU/reports/Sprv.xlt
	UGTU/ugtu.exe
Merge branch 'Release-1.0.4.441' of https://github.com/UGTU/Old-School into Release-1.0.4.441

Conflicts:
	UGTU/reports/SprvPens.xlt
	UGTU/ugtu.exe
precommit
Merge branch 'Release-1.0.4.441' of https://github.com/UGTU/Old-School into Release-1.0.4.441

Conflicts:
	UGTU/ugtu.exe
	UGTU/ugtu.identcache
precommit 497
commit 498