Merge branch 'develop' into 'relation_fix'

# Conflicts:
#   app/controllers/api/v1/citizens_controller.rb
#   app/controllers/application_controller.rb
#   config/routes.rb
1 job for relation_fix in 5 minutes and 7 seconds (queued for 5 seconds)
Status Job ID Name Coverage
  Test
passed #13433
ruby postgres
test

00:05:07