Signed-off-by: unknown <20111224i705@20111224i705-PC.(none)>
Merge branch 'master' of git@github.com:heavenK/gulianlvyou_cms.git

Conflicts:
	b2cservice/B2CService/Tpl/My/orderlist.html

Signed-off-by: unknown <20111224i705@20111224i705-PC.(none)>