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

Conflicts:
	KoalaShopPOS/Properties/licenses.licx