Merge remote-tracking branch 'refs/remotes/origin/master' into origin-dev#79874_explo_contractuel_chambery_connecteur_france_connect

# Conflicts:
#	.gitmodules
#	application/modules/opac/views/scripts/abonne/fiche.phtml
#	cosmogramme/sql/patch/patch_360.php
#	library/Class/AdminVar.php
#	library/ZendAfi/View/Helper/Admin/ContentNav.php
#	public/admin/skins/bokeh74/config.json
#	public/opac/css/global.css
#	tests/application/modules/admin/controllers/ModoControllerTest.php
#	tests/db/UpgradeDBTest.php