Conflicts:
	library/ZendAfi/View/Helper/IconeSupport.php
	library/ZendAfi/View/Helper/ReseauxSociaux.php

Hotline master

See merge request !1645

Stable

See merge request !1644

Hotline#42742 plus d acces aux notices arte vod

See merge request !1643

Merge remote-tracking branch 'refs/remotes/origin/stable' into origin-hotline-master

Conflicts:
	VERSIONS
	library/Class/Catalogue.php
	library/startup.php
	tests/application/modules/opac/controllers/NoticeAjaxControllerTest.php

Sandbox soundcloud

See merge request !1642

Sandbox search input for admin menu

See merge request !1641

Dev#39784 remove captcha

See merge request !1640

Dev#42624 skin update button

See merge request !1639

Merge branch 'hotline#39778_compte_lecteur_gerer_mes_favoris_domaines_doubles_a_chaque_connexion' into 'stable'

Hotline#39778 compte lecteur gerer mes favoris domaines doubles a chaque connexion

See merge request !1630

Dev#42198 library to json

See merge request !1637

Hotline#42356 pas de resultats issus de cvs dans le catalogue

See merge request !1633

Dev#40411 story 6 pouvoir rechercher dans l annuaire demande fille

See merge request !1636

Php7 compatibility

See merge request !1634

Merge branch 'hotline#41431_mention_disponibilite_absente_dans_le_pave_exemplaire_en_recherche_portail_interface_avec_pmb' into 'hotline-master'

Hotline#41431 mention disponibilite absente dans le pave exemplaire en recherche portail interface avec pmb

See merge request !1632