test commit
Merge branch 'master' of https://github.com/pinganlida/daigou.git

Conflicts:
	index.php