更新
Merge branch 'master' of https://github.com/scott2lsb/EasyPayApi

Conflicts:
	.settings/org.eclipse.jdt.core.prefs
	.settings/org.eclipse.wst.common.component
	.settings/org.eclipse.wst.common.project.facet.core.xml