Merged no_adorner_try with master.

Conflicts:
	src/PRAIM.v12.suo
	src/PRAIMGUI/PRAIM-GUI.csproj
	src/PRAIMGUI/SnapshotManager/SnapshotManager.xaml
	src/PRAIMGUI/SnapshotManager/SnapshotManager.xaml.cs
Merge branch 'master' of https://github.com/elys1um/PRAIM

Conflicts:
	src/PRAIMGUI/Images/Thumbs.db
Merged with origin master