Merge branch 'dev' into 'master'

.gitignore

.gitlab-ci.yml

.gitlab/issue_templates/bug.md

.gitlab/issue_templates/default.md

.gitlab/merge_request_templates/default.md

.ignore

.vscode/extensions.json

.vscode/settings.json

CHANGELOG.md

README.md

angular.json

api/Dockerfile

api/package.json

api/server.js

categoriesformations.json

docker-compose.yml

e2e/protractor.conf.js

e2e/src/app.e2e-spec.ts

e2e/src/app.po.ts

e2e/tsconfig.json