Dev#48981 3455 lier des cartes via bokeh

See merge request !1940

Dev#50572 2755 contractuel pouvoir gerer un site totalement prive

See merge request !1937

Merge remote-tracking branch 'refs/remotes/afi/master' into dev#50572_2755_contractuel_pouvoir_gerer_un_site_totalement_prive

# Conflicts:
#	library/ZendAfi/Controller/Plugin/DefineURLs.php

Dev#47709 expiration des sessions sans activite

See merge request !1930

Conflicts:
	VERSIONS
	library/startup.php
	public/opac/css/global.css
	tests/application/modules/admin/controllers/CmsControllerListModeTest.php

Hotline master

See merge request !1927

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

Conflicts:
	VERSIONS
	library/Class/CodifThesaurus.php
	library/startup.php
	tests/library/Class/CodifThesaurusTest.php