Merge branch 'master' of gitlab.constantvzw.org:osp/work.balsamine.www

2 jobs for master
Status Job ID Name Coverage
  Test
canceled #70
deploy

canceled #69
stage