Merge remote-tracking branch 'refs/remotes/origin/master' into origin-dev#64573_amelioration_de_la_charte_modele

Conflicts:
	cosmogramme/sql/patch/patch_342.php
	library/ZendAfi/View/Helper/Admin/Head.php
	library/ZendAfi/View/Helper/TagPreview.php
	public/opac/css/global.css
	tests/db/UpgradeDBTest.php