优化星级选择
Merge remote-tracking branch 'origin/master'

Conflicts:
	scripts/shared/main.js