delete blog
Merge remote-tracking branch 'origin/dev' into dev_jo
Merge remote-tracking branch 'origin/dev' into dev_jo
update shop screen