去掉多余逗号
Merge remote-tracking branch 'chubai/master' into pux

Conflicts:
	composer.json