Things were made
Merge remote-tracking branch 'origin/master'

Conflicts:
	Desktop Client/Source/BadMechanics.PristineEdit.Win32.DesktopClient/ViewModel.cs
	Desktop Client/Source/BadMechanics.PristineEdit.Win32.DesktopClient/ViewModels/MainViewModel.cs