Merge branch 'dev_#15141_merge_agenda_from_bron_to_opac' into demo_wip_valence

Conflicts:
	tests/application/modules/opac/controllers/ProfilOptionsControllerTest.php

tests/application/modules/opac/controllers/ProfilOptionsControllerTest.php

@@ -1835,6 +1835,7 @@ class ProfilOptionsControllerWithFormationExpiredTest extends AbstractController
 
 
 
+
 class ProfilOptionsControllerWithMenuVerticalWidgetAndNewHtmlTest extends AbstractControllerTestCase {
 	public function setUp() {
 		parent::setUp();
@@ -1920,7 +1921,7 @@ class ProfilOptionsControllerWithMenuVerticalWidgetAndNewHtmlTest extends Abstra
 
 
 
-class ProfilOptionsControllerProfilBoiteCalendarWithFilterTestCase extends AbstractControllerTestCase {
+abstract class ProfilOptionsControllerProfilBoiteCalendarWithFilterTestCase extends AbstractControllerTestCase {
 	public function setUp() {
 		parent::setUp();
 				Class_Article::beVolatile();