Premerge
Merge branch 'master' of https://github.com/heshamhossam/smart-hypermarket

Conflicts:
	Desktop/SmartHyperMarket/SmartHyperMarket/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	Desktop/SmartHyperMarket/SmartHyperMarket/obj/Debug/SmartHyperMarket_MarkupCompile.i.cache