previous commit image ready
shop: image update
Merge branch 'dev'