z
M
Holy Shit
Merge branch 'master' of github.com:Deiwos/IMS

Conflicts:
	IMS/IMS.suo
	IMS/IMS/App.xaml
	IMS/IMS/App.xaml.cs
	IMS/IMS/Classes/BindingConverters/PersonFIOConverter.cs
	IMS/IMS/Classes/Pages/Configurators/PageHolderConfiguratorForManager.cs
	IMS/IMS/Database/DBModel.cs
	IMS/IMS/bin/Release/IMS.exe
	IMS/IMS/bin/Release/IMS.pdb
	IMS/IMS/bin/Release/IMS_TabPages.dll
	IMS/IMS/bin/Release/IMS_TabPages.pdb
	IMS/IMS/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	IMS/IMS/obj/x86/Release/App.baml
	IMS/IMS/obj/x86/Release/App.g.cs
	IMS/IMS/obj/x86/Release/App.g.i.cs
	IMS/IMS/obj/x86/Release/Classes/Management/DepartmentsTab.baml
	IMS/IMS/obj/x86/Release/Classes/Management/FacultiesTab.baml
	IMS/IMS/obj/x86/Release/Classes/Management/LibrariansTab.baml
	IMS/IMS/obj/x86/Release/Classes/Management/ManagersTab.baml
	IMS/IMS/obj/x86/Release/Classes/Management/PopupWindows/AccountsManagementWindow.baml
	IMS/IMS/obj/x86/Release/Classes/Management/PopupWindows/ChooseSubjectsWindow.baml
	IMS/IMS/obj/x86/Release/Classes/Management/PopupWindows/DepartmentsManagementWindow.baml
	IMS/IMS/obj/x86/Release/Classes/Management/PopupWindows/FacultyManagementWindow.baml
	IMS/IMS/obj/x86/Release/Classes/Management/PopupWindows/LibrariansManagementWindow.baml
	IMS/IMS/obj/x86/Release/Classes/Management/PopupWindows/ManagersManagementWindow.baml
	IMS/IMS/obj/x86/Release/Classes/Management/PopupWindows/StudentsGroupsManagementWindow.baml
	IMS/IMS/obj/x86/Release/Classes/Management/PopupWindows/StudentsManagementWindow.baml
	IMS/IMS/obj/x86/Release/Classes/Management/PopupWindows/SubjectsManagementWindow.baml
	IMS/IMS/obj/x86/Release/Classes/Management/PopupWindows/TeachersManagementWindow.baml
	IMS/IMS/obj/x86/Release/Classes/Management/StudentsGroupTab.baml
	IMS/IMS/obj/x86/Release/Classes/Management/StudentsTab.baml
	IMS/IMS/obj/x86/Release/Classes/Management/SubjectsTab.baml
	IMS/IMS/obj/x86/Release/Classes/Management/TeachersTab.baml
	IMS/IMS/obj/x86/Release/Classes/Schedule/ScheduleCell.baml
	IMS/IMS/obj/x86/Release/Classes/Schedule/ScheduleColumnHeader.baml
	IMS/IMS/obj/x86/Release/Classes/Schedule/Windows/CopyScheduleWindow.baml
	IMS/IMS/obj/x86/Release/Classes/Schedule/Windows/EditSchedule.baml
	IMS/IMS/obj/x86/Release/Classes/WorkPanels/WorkPanelCommunity.baml
	IMS/IMS/obj/x86/Release/Classes/WorkPanels/WorkPanelJournal.baml
	IMS/IMS/obj/x86/Release/Classes/WorkPanels/WorkPanelJournal.g.cs
	IMS/IMS/obj/x86/Release/Classes/WorkPanels/WorkPanelJournal.g.i.cs
	IMS/IMS/obj/x86/Release/Classes/WorkPanels/WorkPanelLibrary.baml
	IMS/IMS/obj/x86/Release/Classes/WorkPanels/WorkPanelManagement.baml
	IMS/IMS/obj/x86/Release/Classes/WorkPanels/WorkPanelProfile.baml
	IMS/IMS/obj/x86/Release/Classes/WorkPanels/WorkPanelSchedule.baml
	IMS/IMS/obj/x86/Release/Classes/WorkPanels/WorkPanelStatistics.baml
	IMS/IMS/obj/x86/Release/DarkLayer.baml
	IMS/IMS/obj/x86/Release/DesignTimeResolveAssemblyReferencesInput.cache
	IMS/IMS/obj/x86/Release/IMS.csproj.FileListAbsolute.txt
	IMS/IMS/obj/x86/Release/IMS.exe
	IMS/IMS/obj/x86/Release/IMS.g.resources
	IMS/IMS/obj/x86/Release/IMS.pdb
	IMS/IMS/obj/x86/Release/IMS_MessageBox.baml
	IMS/IMS/obj/x86/Release/LoginWindow.baml
	IMS/IMS/obj/x86/Release/MainWindow.baml
	IMS/IMS/obj/x86/Release/ResolveAssemblyReference.cache
	IMS/IMS/obj/x86/Release/TempPE/Database.DatabaseModel.Designer.cs.dll
	IMS_TabPages/IMS_TabPages/bin/Release/IMS_TabPages.dll
	IMS_TabPages/IMS_TabPages/bin/Release/IMS_TabPages.pdb
	IMS_TabPages/IMS_TabPages/obj/Release/IMS_TabPages.dll
	IMS_TabPages/IMS_TabPages/obj/Release/IMS_TabPages.pdb