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

apps/maarch_entreprise/actions/sendFileWS.php

.../maarch_entreprise/indexing_searching/change_category.php

apps/maarch_entreprise/js/indexing.js

core/Controllers/UserController.php

core/Test/DocserverControllerTest.php

core/Test/DocserverToolsControllerTest.php

core/Test/DocserverTypeControllerTest.php

modules/attachments/Controllers/AttachmentsController.php

modules/attachments/Controllers/ReconciliationController.php

modules/convert/Controllers/ProcessConvertController.php

modules/convert/Controllers/ProcessFulltextController.php

...es/convert/Controllers/ProcessManageConvertController.php

modules/convert/Controllers/ProcessThumbnailsController.php

modules/visa/Controllers/VisaController.php

modules/visa/sign_file.php

rest/index.php

src/app/basket/models/BasketModel.php

src/app/resource/controllers/ResController.php

src/app/template/controllers/TemplateController.php

src/core/controllers/CoreController.php