Merge branch 'residences2' into 'dev'

Change les variables type en name ou machine_type pour éviter les confusions

See merge request federez/re2o!413
1 job for dev in 3 minutes and 22 seconds (queued for 3 seconds)
Status Job ID Name Coverage
  Lint
passed #1626
lint

00:03:22