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

# Conflicts:
#	VERSIONS
#	application/modules/admin/controllers/IndexController.php
#	library/Class/WebService/BibNumerique/Numilog/LivreNumerique.php
#	library/Class/WebService/BibNumerique/RessourceNumerique.php
#	library/Class/WebService/OAI.php
#	library/ZendAfi/View/Helper/Accueil/Kiosque.php
#	library/startup.php
#	tests/application/modules/admin/controllers/AdminIndexControllerTest.php
#	tests/library/ZendAfi/View/Helper/Accueil/KiosqueTest.php