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

Conflicts:
	KoalaShop/CategoriesForm.cs
	KoalaShop/Properties/licenses.licx