Merge branch 'feat/webui' of gitlab.com:teraflow-h2020/controller into feat/webui