megre p
Merge branch 'master' of https://github.com/htphongqn/B2C_EC

Conflicts:
	B2C_EC.Model/B2C_EC.Model.csproj
	B2C_EC.Model/bin/Debug/B2C_EC.Model.dll
	B2C_EC.Model/bin/Debug/B2C_EC.Model.pdb
	B2C_EC.Model/obj/Debug/B2C_EC.Model.dll
	B2C_EC.Model/obj/Debug/B2C_EC.Model.pdb
	B2C_EC.Model/obj/Debug/edmxResourcesToEmbed/B2C_EC.csdl
	B2C_EC.Model/obj/Debug/edmxResourcesToEmbed/B2C_EC.msl
	B2C_EC.Website/bin/B2C_EC.Model.dll
	B2C_EC.Website/bin/B2C_EC.Model.pdb
	B2C_EC.Website/bin/B2C_EC.Website.dll
	B2C_EC.Website/bin/B2C_EC.Website.pdb
	B2C_EC.Website/obj/Debug/B2C_EC.Website.csprojResolveAssemblyReference.cache
	B2C_EC.Website/obj/Debug/B2C_EC.Website.dll
	B2C_EC.Website/obj/Debug/B2C_EC.Website.pdb
	B2C_EC.Website/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	B2C_EC.v11.suo
Merge branch 'master' of https://github.com/htphongqn/B2C_EC