Merge remote-tracking branch 'origin/dev_cooperatic' into ticket_820

# Conflicts:
#	reception/views.py
1 job from ticket_820 in 21 seconds (queued for 3 seconds)
Status Job ID Name Coverage
  Test
passed #1237
lint:js

00:21