deploy change.
deploy commit.
delploy commit.
Merge branch 'master' of https://github.com/onesliu/meixincart

Conflicts:
	admin/index.php
	index.php
vqmod delete