create menu link to shop page
Merge remote-tracking branch 'origin/dev_peace' into dev_jo
Merge branch 'dev_peace' into dev