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

# Conflicts:
#	VERSIONS
#	application/modules/opac/controllers/RechercheController.php
#	library/Class/Import/Typo3.php
#	library/startup.php
#	tests/application/modules/admin/controllers/CmsControllerTest.php
#	tests/library/Class/ArticleTest.php