Merge remote-tracking branch 'origin/fixed-allpay-CVS' into HEAD

Conflicts:
	README.md
fixed README.md