moveables move better
automapper
bs
Merge branch 'develop' of https://github.com/bobmulder/windesheim_kbs into develop

Conflicts:
	House of Notrix.v12.suo
	House of Notrix/bin/Debug/House of Notrix.exe
	House of Notrix/bin/Debug/House of Notrix.pdb
	House of Notrix/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	House of Notrix/obj/Debug/House of Notrix.exe
	House of Notrix/obj/Debug/House of Notrix.pdb