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

Conflicts:
	DampGUI/CommunicationLibrary/obj/Debug/CommunicationLibrary.csproj.FileListAbsolute.txt
	DampGUI/CommunicationLibrary/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	DampGUI/DampGUI.v11.suo
	DampGUI/DampGUI/obj/x86/Debug/DampGUI.csproj.FileListAbsolute.txt
	DampGUI/DampGUI/obj/x86/Debug/DampGUI.csprojResolveAssemblyReference.cache