Merge branch 'master' of /Users/Peter/Desktop/gcgj with conflicts.
Merge remote-tracking branch 'origin/master'
Products w. pricetag and clickable

+ sync from docs