修改
Merge branch 'master' of https://github.com/pffair/wjw
跳转差提现说明那个
Merge branch 'master' of https://github.com/pffair/wjw

Conflicts:
	AndroidManifest.xml