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

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

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 master

See merge request !721

# Conflicts:
#	VERSIONS
#	cosmogramme/php/_init.php
#	cosmogramme/sql/patch/patch_232.php
#	library/Class/TypeDoc.php
#	library/Class/UserGroup.php
#	library/startup.php
#	tests/library/Class/UserGroupTest.php