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

apps/maarch_entreprise/cas_connect.php

apps/maarch_entreprise/class/class_login_Abstract.php

...entreprise/indexing_searching/change_category_actions.php

apps/maarch_entreprise/indexing_searching/view_resource.php

apps/maarch_entreprise/sso_connect.php

apps/maarch_entreprise/standard_connect.php

apps/maarch_entreprise/xml/cas_config.xml

apps/maarch_entreprise/xml/menu.xml

core/class/class_resource.php

core/class/docservers_controler.php

modules/life_cycle/batch/logs/extract_data/test.txt

modules/notifications/batch/logs/test.txt

modules/notifications/batch/tmp/test.txt

modules/sendmail/batch/logs/test.txt

modules/sendmail/batch/tmp/test.txt

modules/tags/tags_update.php

rest/index.php

sql/160_to_161.sql