update
Merge branch 'master' of git@github.com:mxshi/unionpay.git

Conflicts:
	docs/mine/ubuntu.txt