Main MiDi Parent
Merge remote-tracking branch 'origin/master' into RavishaHesh

Conflicts:
	GiGi/GiGi.BL/bin/Debug/GiGi.BL.dll
	GiGi/GiGi.BL/bin/Debug/GiGi.BL.pdb
	GiGi/GiGi.BL/obj/Debug/GiGi.BL.csprojResolveAssemblyReference.cache
	GiGi/GiGi.BL/obj/Debug/GiGi.BL.dll
	GiGi/GiGi.BL/obj/Debug/GiGi.BL.pdb
	GiGi/GiGi.UI/bin/Debug/GiGi.BL.dll
	GiGi/GiGi.UI/bin/Debug/GiGi.BL.pdb
	GiGi/GiGi.UI/bin/Debug/GiGi.UI.exe
	GiGi/GiGi.UI/bin/Debug/GiGi.UI.pdb
	GiGi/GiGi.UI/frmHome.Designer.cs
	GiGi/GiGi.UI/frmMainPage.Designer.cs
	GiGi/GiGi.UI/frmMainPage.cs
	GiGi/GiGi.UI/obj/x86/Debug/GiGi.UI.csproj.GenerateResource.Cache
	GiGi/GiGi.UI/obj/x86/Debug/GiGi.UI.csprojResolveAssemblyReference.cache
	GiGi/GiGi.UI/obj/x86/Debug/GiGi.UI.exe
	GiGi/GiGi.UI/obj/x86/Debug/GiGi.UI.pdb
	GiGi/GiGi.suo
cxcxc
Revert "cxcxc"

This reverts commit fd9368e641a2b178d72dcb9db2768df2d6502d49.
UI 2