Merge remote-tracking branch 'origin/master'

Conflicts:
	README.md
chiva
Revert "Merge remote-tracking branch 'origin/master'"

This reverts commit b409d60032b7c44406f77ce5a65deed980d80b8c.
Merge branch 'master' of https://github.com/morningintern/TC_SHOP

Conflicts:
	.idea/workspace.xml