Merge branch 'develop' into '12-create-a-pipeline-to-build-and-publish-the-docker-image-in-gitlab-registry' # Conflicts: # .gitlab-ci.yml
