Merge branch 'hotfix-style-edit-client'
Merge remote-tracking branch 'origin/master'
Merge branch 'develop'
fix index in shops
Merge branch 'hotfix-shopsss'
fix index in shops 2
Merge branch 'hotfix-shopsss'
fix index in shops 3
Merge branch 'master' into develop