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

bin/external/localeo/LocaleoScript.php

bin/external/localeo/config.xml

bin/external/localeo/localeo.sh

bin/external/ozwillo/OzwilloScript.php

rest/index.php

src/app/history/controllers/BatchHistoryController.php

src/app/history/controllers/HistoryController.php

src/app/history/models/BatchHistoryModelAbstract.php

src/app/resource/controllers/ResourceListController.php

...rallel-send-action/send-avis-parallel-action.component.ts

...alidate-action/validate-avis-parallel-action.component.ts

...rkflow-send-action/send-avis-workflow-action.component.ts

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

src/frontend/app/administration/administration.module.ts

...ield/contacts-custom-fields-administration.component.html

...ontact/group/contacts-group-administration.component.html

...ntact/group/contacts-groups-administration.component.html

.../contact/list/contacts-list-administration.component.html

.../contact/page/contacts-page-administration.component.html

...ministration/contact/page/form/contacts-form.component.ts