Merge branch 'ticket_397' into 'dev_cooperatic'

ticket_397

See merge request !49
2 jobs from dev_cooperatic in 1 minute 24 seconds (queued for 2 seconds)
Status Job ID Name Coverage
  Test
passed #1555
lint:js

00:21

passed #1556
unit:django

01:02