ש
Merge branch 'master' of https://github.com/elys1um/PRAIM

Conflicts:
	src/PRAIMDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	src/PRAIMGUI/bin/Debug/PRAIM.pdb
	src/PRAIMGUI/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	src/PRAIMGUI/obj/Debug/PRAIM-GUI.csproj.FileListAbsolute.txt
	src/PRAIMGUI/obj/Debug/PRAIM.g.resources
	src/PRAIMGUI/obj/Debug/PRAIM.pdb
Merge branch 'master' of https://github.com/elys1um/PRAIM

Conflicts:
	src/PRAIMDataBase/bin/Debug/PRAIM.exe
	src/PRAIMDataBase/bin/Debug/PRAIM.pdb
	src/PRAIMDataBase/bin/Debug/PRAIMDataBase.exe
	src/PRAIMDataBase/bin/Debug/PRAIMDataBase.pdb
	src/PRAIMDataBase/obj/Debug/PRAIMDataBase.csprojResolveAssemblyReference.cache
	src/PRAIMDataBase/obj/Debug/PRAIMDataBase.exe
	src/PRAIMDataBase/obj/Debug/PRAIMDataBase.pdb