update

update
Merge branch 'master' of https://github.com/grz/wxpay_scanpay_java_demo

Conflicts:
	.gitignore

Conflicts:
	.gitignore
Merge branch 'master' of https://github.com/grz/wxpay_scanpay_java_demo