update shop view and change parameter fb to gb
Merge branch 'dev_jo' into dev
Merge remote-tracking branch 'origin/dev' into dev