dli ta mahadlok mo push
Merge branch 'master' of https://github.com/KoalaWares/GenericInventory

Conflicts:
	Demo/obj/Debug/Demo.csproj.FileListAbsolute.txt
	Demo/obj/Debug/Demo.csproj.GenerateResource.Cache
	Demo/obj/Debug/Demo.csprojResolveAssemblyReference.cache
	Demo/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	KoalaShop/Properties/licenses.licx