no message
Merge branch 'develop' of https://github.com/bobmulder/windesheim_kbs into develop

Conflicts:
	House of Notrix/House of Notrix.csproj
	House of Notrix/obj/Debug/House of Notrix.csproj.FileListAbsolute.txt
Merge branch 'develop' of https://github.com/bobmulder/windesheim_kbs into develop

Conflicts:
	DAL/bin/Debug/DAL.dll
	DAL/bin/Debug/DAL.pdb
	DAL/obj/Debug/DAL.csproj.FileListAbsolute.txt
	DAL/obj/Debug/DAL.dll
	DAL/obj/Debug/DAL.pdb
	House of Notrix.v12.suo
	House of Notrix/obj/Debug/House of Notrix.csproj.FileListAbsolute.txt
	House of Notrix/obj/Debug/House of Notrix.csproj.GenerateResource.Cache
	House of Notrix/obj/Debug/House of Notrix.csprojResolveAssemblyReference.cache
	House of Notrix/obj/Debug/House of Notrix.exe
	House of Notrix/obj/Debug/House of Notrix.pdb
	UpgradeLog.htm