Conflicts:
	ui/ui-frontend/projects/pastis/src/app/main/main.component.ts
	ui/ui-frontend/projects/pastis/src/app/models/file-node.ts
	ui/ui-frontend/projects/pastis/src/app/profile/edit-profile/file-tree-metadata/file-tree-metadata.component.scss
	ui/ui-frontend/projects/pastis/src/app/profile/edit-profile/file-tree-metadata/file-tree-metadata.component.ts
	ui/ui-frontend/projects/pastis/src/app/profile/edit-profile/file-tree-metadata/file-tree-metadata.service.ts
	ui/ui-frontend/projects/pastis/src/app/profile/edit-profile/file-tree/file-tree.component.ts
	ui/ui-frontend/projects/pastis/src/app/profile/edit-profile/file-tree/file-tree.service.ts
	ui/ui-frontend/projects/pastis/src/app/profile/edit-profile/file-tree/pipes/file-tree-filter.pipe.spec.ts
	ui/ui-frontend/projects/pastis/src/app/profile/list-profile/list-profile.component.ts
	ui/ui-frontend/projects/pastis/src/app/profile/profile.module.ts
	ui/ui-frontend/projects/pastis/src/app/shared/pastis-popup-option/pastis-popup-option.component.ts
	ui/ui-frontend/projects/pastis/src/app/shared/shared.module.ts
	ui/ui-frontend/projects/pastis/src/app/user-actions/save-profile/save-profile.component.ts
	ui/ui-frontend/projects/pastis/src/app/user-actions/user-actions.module.ts