圖片
Merge remote-tracking branch 'origin/master'

Conflicts:
	config/locales/備份_zh_CN.yml