Fixes and Adds Here and there
Merge https://github.com/Software-Repos/ORM

Conflicts:
	ORM/bin/Debug/ORM.dll
	ORM/bin/Debug/ORM.pdb
	ORM/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	ORM/obj/Debug/ORM.csproj.FileListAbsolute.txt
	ORM/obj/Debug/ORM.dll
	ORM/obj/Debug/ORM.pdb