master merge
origin/HEAD
shoplist sync response changed to list