Merge branch 'master' into 'issue153_ACCent_activity_admin'

# Conflicts:
#   CHANGELOG.md
#   src/Bundle/ChillCalendarBundle/Menu/UserMenuBuilder.php

src/Bundle/ChillCalendarBundle/Form/CalendarType.php

@@ -188,7 +188,7 @@ class CalendarType extends AbstractType
                     }
                     return $location->getId();
                 },
-                function (?string $id): Location {
+                function (?string $id): ?Location {
                     return $this->om->getRepository(Location::class)->findOneBy(['id' => (int) $id]);
                 }
             ))

src/Bundle/ChillCalendarBundle/Menu/UserMenuBuilder.php

@@ -17,6 +17,7 @@
  */
 namespace Chill\CalendarBundle\Menu;
 
+use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
 use Knp\Menu\MenuItem;
 use Chill\TaskBundle\Templating\UI\CountNotificationTask;
@@ -87,5 +88,5 @@ class UserMenuBuilder implements LocalMenuBuilderInterface
     {
         return [ 'user' ];
     }
-    
+
 }