修改 网银在线支付 遇到淘宝信任登录时 没有email 照成的支付失败问题
Merge branch 'master' of github.com:wentianle/1xshi

Conflicts:
	plugins/app/pay_wangjin/pay_wangjin.php
	themes/1365039822/index.html