modify:修改默认的图片
Merge remote-tracking branch 'origin/dev'

Conflicts:
	dump.rdb