Updated texts in shop view
Merge branch 'shop-text' into develop