Merge branch 'hotline#66702_probleme_affichage_image_sur_chrome_et_firefox_suite_passage_version_master' into 'hotline-master'

hotline #66702 : tell jquery.cycle to not set background color

See merge request !2400

Conflicts:
	cosmogramme/sql/patch/patch_337.php
	tests/db/UpgradeDBTest.php

Hotline#67232 dole moissonnage pnb ne fonctionne plus

See merge request !2393

Dev#65552 rendre les reservation afimultimedia plus visible

See merge request !2388

Merge branch 'dev#49315_ajouter_un_commentaire_sur_les_postes_etou_groupe_de_poste_visible_lors_de_la_reservation_cote_bokeh' into 'stable'

dev #49315 add note to devices

See merge request !2389

Merge branch 'dev#66943_bokeh_ne_met_pas_a_jour_la_reservation_qui_n_a_pas_ete_consommee' into 'stable'

dev #66943 update previous hold end time when overwrite

See merge request !2390

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

# Conflicts:
#	VERSIONS
#	application/modules/admin/views/scripts/profil/proprietes.phtml
#	library/startup.php

Hotline#66742 la madeleine pbm sur kiosque et affichage de resultats

See merge request !2387

Conflicts:
	VERSIONS
	VERSIONS_HOTLINE/65680
	library/startup.php

hotline #65680 fix artevod

See merge request !2383

Hotline master

See merge request !2382

Stable

See merge request !2381

hotline #65246 fix double finder

See merge request !2378