Conflicts:
	cosmogramme/php/_init.php
	library/startup.php
	tests/application/modules/admin/controllers/BibControllerTest.php

Dev#15527 localisation bib add genre

See merge request !493

Hotline 6.54

See merge request !489

cannot save two pages with same url and without parents

Merge branch 'hotline_#17242_cms_workflow_send_mail_to_author_when_article_is_accepted' into 'hotline_6.54'

Hotline #17242 cms workflow send mail to author when article is accepted

See merge request !481

Hotline#17308 view not set on webthumbnail viewhelper

See merge request !487

Hotline/17157 marc conf is not shown

See merge request !485

Hotline 6.54

See merge request !483

selecting unimarc or marc21 in profil creation.

Hotline #16972 upgrade doc

Adds a note about upgrading bokeh after team feedbacks.

See merge request !468

Dev #13854 phonetix collision

See merge request !482

Hotline/17236 fix double encoding on update

See merge request !480

Merge branch 'hotline_#17017_missing_informations_in_user_account_with_soap_client' into 'hotline_6.54'

Hotline #17017 missing informations in user account with soap client

Integration of MappedSoapClient into InspectorGadget

See merge request !478

Profil menu use url rewrite for a page even if parent profil does not
haver rewrite url

Sandbox #16325 inspector gadget

See merge request !476

Merge branch 'hotline_#17191_fix_sito_html_img_if_bluga_disabled_and_no_local_img' into 'hotline_6.54'

Hotline #17191 fix sito html img if bluga disabled and no local img

See merge request !474

Hotline#15989 lost locations

See merge request !475

Hotline #16530 download issue on epub download link

See merge request !472

Hotline #16538 issue with biblio records url in newsletters

See merge request !473