Merged with dmhadar_dev.

Conflicts:
	.gitignore
	src/PRAIMGUI/PRAIM-GUI.csproj
	src/PRAIMGUI/PRAIMWindow.xaml
	src/PRAIMGUI/ViewModels/PRAIMViewModel.cs
	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
Trying to resolve merge.
Fixed.
Merge branch 'master' of https://github.com/elys1um/PRAIM

Conflicts:
	.gitignore
	src/PRAIMGUI/Views/PRAIMWindow.xaml
	src/PRAIMGUI/Views/PRAIMWindow.xaml.cs
	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
Merged code with dvir.