shop view
Merge branch 'dev'