.
Merge branch 'master' of https://github.com/HackworthCForge/SolForgeInventory

Conflicts:
	SolForgeInventory.v11.suo
	SolForgeInventory/bin/Debug/SolForgeInventory.exe
	SolForgeInventory/bin/Debug/SolForgeInventory.pdb
	SolForgeInventory/obj/Debug/App.g.cs
	SolForgeInventory/obj/Debug/App.g.i.cs

	SolForgeInventory/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	SolForgeInventory/obj/Debug/GeneratedInternalTypeHelper.g.cs
	SolForgeInventory/obj/Debug/GeneratedInternalTypeHelper.g.i.cs

	SolForgeInventory/obj/Debug/SolForgeInventory.csproj.FileListAbsolute.txt

	SolForgeInventory/obj/Debug/SolForgeInventory.csproj.GenerateResource.Cache

	SolForgeInventory/obj/Debug/SolForgeInventory.csprojResolveAssemblyReference.cache
	SolForgeInventory/obj/Debug/SolForgeInventory.exe
	SolForgeInventory/obj/Debug/SolForgeInventory.pdb
	SolForgeInventory/obj/Debug/SolForgeInventory_MarkupCompile.cache
	SolForgeInventory/obj/Debug/SolForgeInventory_MarkupCompile.i.cache