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

modules/folder/class/class_admin_foldertypes_Abstract.php

modules/folder/show_folder.php

src/app/basket/controllers/BasketController.php

src/app/basket/models/BasketModel.php

src/app/basket/models/BasketModelAbstract.php

src/app/basket/models/GroupBasketModel.php

src/app/basket/models/GroupBasketModelAbstract.php

src/app/entity/controllers/ListTemplateController.php

src/app/user/controllers/UserController.php

src/app/user/models/UserModelAbstract.php