add source
Merge branch 'master' of https://github.com/guzeng/2

Conflicts:
	app/lang/zh/text.php
我的订单
常用地址