Merge branch 'master' of https://gitlab.com/teraflow-h2020/controller into develop