把demo拆分到另外一个项目wxpay_scanpay_java_demo

把demo拆分到另外一个项目wxpay_scanpay_java_demo
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/com/tencent/Main.java