Conflicts solved:
	cosmogramme/php/_init.php
	cosmogramme/sql/patch/patch_246.php
	library/Class/CmsUrlTransformer.php

Merge branch 'stable' into hotline-master

Hotline#24206 unable ta add new module

See merge request !845

Hotline#24569 unable to choice file format

See merge request !841

Hotline #18668 wkipedia api

See merge request !833

Hotline#24903 thumbnails urls

See merge request !851

changed to ZF format

Hotline master

See merge request !849

  - Fix SQL update so the cosmogramme variable site_retrait_resa is not locked.
  - Fix chosen pickup location reservation's regression.
  - More explicit test names.

Hotline#24664 article access rights

See merge request !847