Merge branch 'develop' into user_quota

.angular-cli.json

...rch_entreprise/Views/action-administration.component.html

...ch_entreprise/Views/actions-administration.component.html

apps/maarch_entreprise/Views/administration.component.html

...Views/basket-administration-settings-modal.component.html

...rch_entreprise/Views/basket-administration.component.html

...ch_entreprise/Views/baskets-administration.component.html

...eprise/Views/diffusionModel-administration.component.html

...prise/Views/diffusionModels-administration.component.html

...h_entreprise/Views/doctypes-administration.component.html

...h_entreprise/Views/entities-administration.component.html

...rch_entreprise/Views/entity-administration.component.html

...arch_entreprise/Views/group-administration.component.html

...rch_entreprise/Views/groups-administration.component.html

apps/maarch_entreprise/Views/header.component.html

...ch_entreprise/Views/history-administration.component.html

...treprise/Views/historyBatch-administration.component.html

apps/maarch_entreprise/Views/menu.component.html

apps/maarch_entreprise/Views/menuNav.component.html

...treprise/Views/notification-administration.component.html