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

Conflicts:
	SolForgeInventory.v11.suo

	SolForgeInventory/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache

	SolForgeInventory/obj/Debug/SolForgeInventory.csproj.FileListAbsolute.txt
	SolForgeInventory/obj/Debug/SolForgeInventory_MarkupCompile.i.cache