Merge branch 'develop' of labs.maarch.org:maarch/MaarchCourrier into develop

...reprise/Views/baskets-order-administration.component.html

apps/maarch_entreprise/Views/profile.component.html

...gular/app/administration/administration-routing.module.js

...gular/app/administration/administration-routing.module.ts

...se/js/angular/app/administration/administration.module.js

...se/js/angular/app/administration/administration.module.ts

.../administration/baskets-order-administration.component.js

.../administration/baskets-order-administration.component.ts

...gular/app/administration/user-administration.component.ts

apps/maarch_entreprise/js/angular/app/profile.component.js

apps/maarch_entreprise/js/angular/app/profile.component.ts

apps/maarch_entreprise/js/angularFunctions.js

rest/index.php

src/app/basket/controllers/BasketController.php

src/app/history/controllers/HistoryController.php