asas
Merge branch 'master' of https://github.com/youniforever/test.git

Conflicts:
	payment.php