Fixed a thing

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

Conflicts:
	CustomerInterface/CustomerInterface.v11.suo
	CustomerInterface/CustomerInterface/NSAComponent.cs
	CustomerInterface/CustomerInterface/NSADatabase.cs
	CustomerInterface/CustomerInterface/NSAMenuItem.cs
	CustomerInterface/CustomerInterface/Program.cs
	CustomerInterface/CustomerInterface/StartForm.Designer.cs
	CustomerInterface/CustomerInterface/StartForm.cs
	CustomerInterface/CustomerInterface/bin/Debug/CustomerInterface.exe
	CustomerInterface/CustomerInterface/bin/Debug/CustomerInterface.pdb
	CustomerInterface/CustomerInterface/bin/Debug/de/CustomerInterface.resources.dll
	CustomerInterface/CustomerInterface/bin/Debug/es/CustomerInterface.resources.dll
	CustomerInterface/CustomerInterface/bin/Debug/fr/CustomerInterface.resources.dll
	CustomerInterface/CustomerInterface/obj/Debug/CustomerInterface.csproj.GenerateResource.Cache
	CustomerInterface/CustomerInterface/obj/Debug/CustomerInterface.exe
	CustomerInterface/CustomerInterface/obj/Debug/CustomerInterface.pdb
	CustomerInterface/CustomerInterface/obj/Debug/de/CustomerInterface.resources.dll
	CustomerInterface/CustomerInterface/obj/Debug/es/CustomerInterface.resources.dll
	CustomerInterface/CustomerInterface/obj/Debug/fr/CustomerInterface.resources.dll
Merge branch 'master' of https://github.com/bmsmith/NSA-Sandwich.git

Conflicts:
	CustomerInterface/CustomerInterface.v11.suo
	CustomerInterface/CustomerInterface/NSADatabase.cs
	CustomerInterface/CustomerInterface/StartForm.Designer.cs
	CustomerInterface/CustomerInterface/bin/Debug/CustomerInterface.exe
	CustomerInterface/CustomerInterface/bin/Debug/CustomerInterface.pdb
	CustomerInterface/CustomerInterface/bin/Debug/de/CustomerInterface.resources.dll
	CustomerInterface/CustomerInterface/bin/Debug/es/CustomerInterface.resources.dll
	CustomerInterface/CustomerInterface/bin/Debug/fr/CustomerInterface.resources.dll
	CustomerInterface/CustomerInterface/obj/Debug/CustomerInterface.csproj.GenerateResource.Cache
	CustomerInterface/CustomerInterface/obj/Debug/CustomerInterface.exe
	CustomerInterface/CustomerInterface/obj/Debug/CustomerInterface.pdb
	CustomerInterface/CustomerInterface/obj/Debug/de/CustomerInterface.resources.dll
	CustomerInterface/CustomerInterface/obj/Debug/es/CustomerInterface.resources.dll
	CustomerInterface/CustomerInterface/obj/Debug/fr/CustomerInterface.resources.dll