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

Conflicts:
	寮€鍙戞枃妗?/VipPay/缃戠珯淇?鏀瑰唴瀹?/闂?棰?.txt