Merge branch 'dev_cooperatic' into '3001-display-last-product-added-date'

# Conflicts:
#   shelfs/models.py
2 jobs from 3001-display-last-product-added-date in 1 minute 28 seconds (queued for 1 second)
Status Job ID Name Coverage
  Test
passed #3488
lint:js

00:21

passed #3489
unit:django

01:07