Merge remote-tracking branch 'origin/master'

Conflicts:
	Waterkiller/bin/Debug/Waterkiller.exe
	Waterkiller/bin/Debug/Waterkiller.pdb
	Waterkiller/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	Waterkiller/obj/Debug/Waterkiller.csproj.FileListAbsolute.txt
	Waterkiller/obj/Debug/Waterkiller.csproj.GenerateResource.Cache
	Waterkiller/obj/Debug/Waterkiller.exe
	Waterkiller/obj/Debug/Waterkiller.pdb

ContourAnalys Source
Merge remote-tracking branch 'origin/master'

Conflicts:
	Waterkiller/bin/Debug/Waterkiller.exe
	Waterkiller/bin/Debug/Waterkiller.pdb
	Waterkiller/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	Waterkiller/obj/Debug/Waterkiller.csproj.FileListAbsolute.txt
	Waterkiller/obj/Debug/Waterkiller.csproj.GenerateResource.Cache
	Waterkiller/obj/Debug/Waterkiller.exe
	Waterkiller/obj/Debug/Waterkiller.pdb