Signed-off-by: yandi.zheng@gmail.com <yandi.zheng@gmail.com>
Merge branch 'master' of git@github.com:yandizheng/prototype.git

Conflicts:
	SalesMemeberships/ZRHMemberships/CustomerModule/CustomerCardAmount.aspx
	SalesMemeberships/ZRHMemberships/Log Files/Global/log.txt
	SalesMemeberships/ZRHMemberships/Web.config

Signed-off-by: yandi.zheng@gmail.com <yandi.zheng@gmail.com>
Signed-off-by: yandi.zheng@gmail.com <yandi.zheng@gmail.com>
Merge branch 'master' of git@github.com:yandizheng/prototype.git

Conflicts:
	SalesMemeberships/ZRHMemberships/Log Files/Global/log.txt
	SalesMemeberships/ZRHMemberships/Log Files/Global/log.txt20131216-22
	SalesMemeberships/ZRHMemberships/Web.config