Conflicts:
	ui/ui-pastis/src/main/java/fr/gouv/vitamui/pastis/config/PastisContextConfiguration.java

KDE - 19/11/2021 - Ajout Ui-Referential Ensemble fonctionnel test Postman - Keystore Trustore valide 65 - Change BDD sandbox78

Conflicts:
	ui/ui-pastis-test/src/main/resources/application-dev.yml

Conflicts:
	ui/ui-pastis-test/src/main/config/ui-pastis-application-dev.yml

Conflicts:
	ui/ui-frontend-common/icomoon-selection.json
	ui/ui-frontend-common/src/app/modules/application-id.enum.ts
	ui/ui-frontend-common/src/app/modules/components/header/header.component.ts
	ui/ui-frontend-common/src/app/modules/components/header/select-language/select-language.component.ts
	ui/ui-frontend-common/src/sass/icons/fonts/vitamui-icon.eot
	ui/ui-frontend-common/src/sass/icons/fonts/vitamui-icon.svg
	ui/ui-frontend-common/src/sass/icons/fonts/vitamui-icon.ttf
	ui/ui-frontend-common/src/sass/icons/fonts/vitamui-icon.woff
	ui/ui-frontend-common/src/sass/icons/vitamui-icons.css
	ui/ui-frontend/package.json
	ui/ui-frontend/projects/referential/src/app/app-routing.module.ts
	ui/ui-frontend/projects/starter-kit/src/app/components/icons/icons.component.html
	ui/ui-pastis/src/main/config/logo.png

Merge pull request #515 from ProgrammeVitam/vas_item_7392_exteranlize_iam_services_timeout_configuration

[Vas] Item 7392 - Make timout for iam internal and external for admin action configurable

Merge mis a jour vitam-ui

See merge request !51

story #8787 - Allow snapshot packaging

[VAS] : add fixe to config project