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

# Conflicts:
#	VERSIONS
#	cosmogramme/php/_init.php
#	cosmogramme/sql/patch/patch_233.php
#	library/startup.php

Conflicts:
	library/Class/AdminVar.php
	library/Class/Batch.php
	library/Class/TypeDoc.php
	library/Class/WebService/BibNumerique/RessourceNumerique.php
	scripts/emacs/yasnippet/snippets/text-mode/php-mode/teardown
	tests/fixtures/RessourcesNumeriquesFixtures.php

Conflicts:
	cosmogramme/php/_init.php
	cosmogramme/sql/patch/patch_235.php
	library/Class/AdminVar.php
	tests/library/Class/WebService/ToutApprendreTest.php

Hotline#16321 encoding issue in dewey table

See merge request !727

For now, only 'on-off' type is available.
It displays a checkbox on edit form, and text "Enabled/Disabled" on
variables list.

Hotline#16321 encoding issue in dewey table

See merge request !726

Conflicts:
	cosmogramme/sql/patch/patch_235.php
	cosmogramme/sql/patch/patch_236.php

Conflicts:
	cosmogramme/php/_init.php
	cosmogramme/sql/patch/patch_234.php

Conflicts:
	library/Class/AdminVar.php

Hotline#18602 calendar config icon disappear

See merge request !712