no message
Merge branch 'master' of https://github.com/sankirna/Inventory_New

Conflicts:
	Inventory/Inventory.WEB/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	Inventory/Inventory.v11.suo