Merge remote-tracking branch 'refs/remotes/afi/master' into dev#18027-categories-permissions-retrocompat

Conflicts:
	application/modules/admin/controllers/CmsController.php
	application/modules/admin/controllers/OuverturesController.php
	application/modules/admin/controllers/TypeDocsController.php
	cosmogramme/php/_init.php
	cosmogramme/sql/patch/patch_225.sql
	library/ZendAfi/Acl/AdminControllerRoles.php
	library/ZendAfi/Form/Admin/UserGroup.php
	library/ZendAfi/View/Helper/ComboParentCategorie.php
	library/ZendAfi/View/Helper/TreeView.php
	tests/library/Class/AdminVarTest.php