glitch
Merge branch 'master' of https://github.com/KoalaWares/GenericInventory

Conflicts:
	Demo/obj/Debug/Demo.csprojResolveAssemblyReference.cache
	KoalaShop/FormEmployee.Designer.cs
	KoalaShop/FormEmployee.cs
	KoalaShop/Properties/licenses.licx
	KoalaShop/Properties/licenses.licx.bak