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

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

Conflicts:
	src/Common/bin/Debug/Common.dll
	src/Common/bin/Debug/Common.pdb
	src/Common/obj/Debug/Common.csproj.FileListAbsolute.txt
	src/Common/obj/Debug/Common.dll
	src/Common/obj/Debug/Common.pdb
	src/Common/obj/Debug/Common_MarkupCompile.cache
	src/Common/obj/Debug/Common_MarkupCompile.i.cache
	src/Common/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	src/PRAIM.v11.suo
	src/PRAIMDataBase/PRAIMTable.mdf
	src/PRAIMDataBase/PRAIMTable_log.ldf
	src/PRAIMGUI/PRAIMViewModel.cs
	src/PRAIMGUI/PRAIMWindow.xaml
aa