Fixed DB stuff
Merge branch 'master' of https://github.com/bmsmith/NSA-Sandwich.git

Conflicts:
	CustomerInterface/CustomerInterface.v11.suo
	CustomerInterface/CustomerInterface/obj/Debug/CustomerInterface.csproj.FileListAbsolute.txt
	CustomerInterface/CustomerInterface/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	Emulate Credit/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	Emulate cash/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache