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

Conflicts:
	B2C_EC.Model/Data/UserRepo.cs