Merge branch 'stable' into hotline-master

Conflicts:
	cosmogramme/sql/patch/patch_266.php

cosmogramme/sql/patch/patch_273.php

 <?php
 // update reviews to attach reviews to notices
-$reviews = Class_Cosmogramme_Integration_PhaseReviews::getPhaseWithoutContext();
-$reviews->_execute();
+// $reviews = Class_Cosmogramme_Integration_PhaseReviews::getPhaseWithoutContext();
+// $reviews->_execute();
 ?>