Conflicts:
	VERSIONS
	library/Class/AdminVar/JsStat.php
	library/Class/WebService/BibNumerique/RessourceNumerique.php
	library/Class/WebService/SIGB/Nanook/Service.php
	library/startup.php

Merge branch 'hotline#59612_module_bibliotheque_ajout_d_un_parametre_dans_la_recuperation_d_openstreetmap' into 'stable'

hotline #59612 add padding to OSM fitbounds

See merge request !2273

hotline #63503 fix columns size in bib_admin_profil

See merge request !2274

Merge branch 'hotline#62596_differentier_les_blocs_disponibles_des_blocs_selectionnes_dans_le_parametrage_des_boites' into 'hotline-master'

hotline #62596 improve page settings css

See merge request !2275

Merge branch 'hotline#61804_appel_a_une_boite_kiosque_a_partir_d_un_menu_dysfonctionnement_' into 'hotline-master'

hotline #61804 vertical menu now display widgets

See merge request !2276

hotline #62772 upgrade assimil parser

See merge request !2277

hotline #61463 replace popup with flash messenger in hold cancelation process.

See merge request !2278

hotline #62772 add new sso cas url

See merge request !2279

hotline #61720 : do not use sprintf on string that can contains url encoded chars

See merge request !2272

hotline #62463 : update thesaurus  when updating options custom fields values

See merge request !2234

hotline #63223 : fix typo

See merge request !2271

hotline #52810 : in piwik context, directly retreive piwik site id

See merge request !2270

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

# Conflicts:
#	VERSIONS
#	library/startup.php

Hotline#60748 cavy domaine selection d occurences multiples ko

See merge request !2267

Hotline#63041 boites onglets ne se referment pas

See merge request !2263

hotline #62244 dynamically adapt piwik iframe to window

See merge request !2266

hotline #60174: fix infinite loop in ChoixPictogramme + refactoring

See merge request !2265

hotline #60059 in responsive mode, tablesorted tables are horizontally srollable

See merge request !2261