edrthrf
zxvxcv
Merge branch 'master' of https://github.com/damp/Damp

Conflicts:
	DampGUI/ConnectionLibrary/bin/Debug/ConnectionLibrary.dll
	DampGUI/ConnectionLibrary/bin/Debug/ConnectionLibrary.pdb
	DampGUI/ConnectionLibrary/obj/Debug/ConnectionLibrary.csproj.FileListAbsolute.txt
	DampGUI/ConnectionLibrary/obj/Debug/ConnectionLibrary.dll
	DampGUI/ConnectionLibrary/obj/Debug/ConnectionLibrary.pdb
	DampGUI/DampGUI.v11.suo
	DampGUI/DampGUI/obj/x86/Debug/DampGUI.csproj.FileListAbsolute.txt
	DampGUI/DampGUI/obj/x86/Debug/SimpleMvvm-Wpf_MarkupCompile.cache
	DampGUI/DampGUI/obj/x86/Debug/SimpleMvvm-Wpf_MarkupCompile.i.cache
	DampGUI/DampGUI/obj/x86/Debug/SimpleMvvm-Wpf_MarkupCompile.lref