Merge branches 'datalog-research-input' and 'updated-datalog-research-input' of https://gitlab.alpha.grandlyon.com/refonte-data/admin-gui into datalog-research-input

# Conflicts:
#	src/app/app.module.ts
#	src/app/app.routing.module.ts
#	src/app/components/index.ts
#	src/app/components/menu/menu.component.html
#	src/app/services/app-config.service.ts
#	src/assets/config/config.json