Conflicts:
	cosmogramme/sql/patch/patch_265.php
	cosmogramme/sql/patch/patch_266.php
	tests/application/modules/admin/controllers/SystemeControllerWebServicesTest.php

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

# Conflicts:
#	VERSIONS
#	library/startup.php

Hotline master

See merge request !1077

Sandbox critics type doc icon

See merge request !1056

# Conflicts:
#	cosmogramme/php/_init.php
#	cosmogramme/sql/patch/patch_264.php
#	library/Class/Batch.php

Hotline#25564 wrong moderations stats

See merge request !1070

Dev #21694 stop delete notice

See merge request !1071

Merge branch 'origin-stable' into origin-hotline-master

Conflicts:
	VERSIONS
	library/startup.php
	tests/library/Class/WebService/SIGB/OrpheeFixtures.php

Dev#25302 add custom fields to sitos

See merge request !1069

Dev #27625 nanook display responsability

See merge request !1068

Hotline#28822 search speed

See merge request !1065

Hotline#27895 orphee webservice changes

See merge request !1064

Hotline #28967 blog hierarchical limit nb display

See merge request !1060