Megring
Solve merging problem
Merge solving
Merge branch 'master' of https://github.com/heshamhossam/smart-hypermarket

Conflicts:
	Desktop/DataEntryManager/obj/Debug/AddProduct.g.i.cs
	Desktop/DataEntryManager/obj/Debug/App.g.i.cs
	Desktop/DataEntryManager/obj/Debug/EditProduct.g.i.cs
	Desktop/DataEntryManager/obj/Debug/GeneratedInternalTypeHelper.g.i.cs
	Desktop/DataEntryManager/obj/Debug/MainWindow.g.i.cs
	Desktop/DataEntryManager/obj/Debug/ShowProducts.g.i.cs
	Desktop/Desktop.v12.suo
	Desktop/ModelsLib/bin/Debug/ModelsLib.dll
	Desktop/ModelsLib/bin/Debug/ModelsLib.pdb
	Desktop/ModelsLib/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	Desktop/ModelsLib/obj/Debug/ModelsLib.csproj.FileListAbsolute.txt
	Desktop/ModelsLib/obj/Debug/ModelsLib.dll
	Desktop/ModelsLib/obj/Debug/ModelsLib.pdb
	Desktop/StorageManager/bin/Debug/ModelsLib.dll
	Desktop/StorageManager/obj/Debug/StorageManager.csprojResolveAssemblyReference.cache