Updates
Merge remote-tracking branch 'origin/master'

Conflicts:
	Project
Implementation/onClickInventory/onClickInventory/bin/Debug/onClickInventory.pdb
	Project
Implementation/onClickInventory/onClickInventory/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache
	Project
Implementation/onClickInventory/onClickInventory/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	Project
Implementation/onClickInventory/onClickInventory/obj/x86/Debug/onClickInventory.csproj.FileListAbsolute.txt
	Project
Implementation/onClickInventory/onClickInventory/obj/x86/Debug/onClickInventory.csproj.GenerateResource.Cache
	Project
Implementation/onClickInventory/onClickInventory/obj/x86/Debug/onClickInventory.pdb