Pre merge
Pre merge 2
Pre merge
Merge branch 'master' of https://github.com/heshamhossam/smart-hypermarket

Conflicts:
	Desktop/DataEntryManager/bin/Debug/DataEntryManager.exe
	Desktop/DataEntryManager/bin/Debug/ModelsLib.dll
	Desktop/DataEntryManager/bin/Debug/ModelsLib.pdb
	Desktop/DataEntryManager/obj/Debug/DataEntryManager.csprojResolveAssemblyReference.cache
	Desktop/DataEntryManager/obj/Debug/DataEntryManager_MarkupCompile.i.cache
	Desktop/Desktop.v12.suo