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

* [XEL] Update dev spring config (#359)

* [VAS] Bug 8240 : Access file format on multi tenants organisation (#481)

Co-authored-by: Passam KASSEM <passam.kassem@focati-solutions.com>

* [TECH FOX-674] Use spring profile for UI

* [TECH FOX-671] Use spring profile for External and Internal layer

Co-authored-by: KASSEM Passam <passam.kassem@gmail.com>
Co-authored-by: Passam KASSEM <passam.kassem@focati-solutions.com>
Co-authored-by: Julien CORNILLE <julien.cornille@xelians.fr>

* Set up version from 4.5.0-SNAPSHOT to 5rc.0

* update vitamui modules with Dev modules simplification, update documents, revert --legacy-peer-deps option

Co-authored-by: pyXelians <74011448+pyXelians@users.noreply.github.com>
Co-authored-by: KASSEM Passam <passam.kassem@gmail.com>
Co-authored-by: Passam KASSEM <passam.kassem@focati-solutions.com>
Co-authored-by: Julien CORNILLE <julien.cornille@xelians.fr>
Co-authored-by: vitam-prg <no-reply@programmevitam.fr>

Co-authored-by: Passam KASSEM <passam.kassem@focati-solutions.com>

Fixed guards and header's CSS

See merge request !50

Fix breadcrumbs label

See merge request !49