Merge branch 'master' into ticket-app-master

# Conflicts:
#	.junie/guidelines.md
#	src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/App2.vue
#	src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/ButtonLocation.vue

src/Bundle/ChillMainBundle/Entity/UserGroup.php

@@ -258,6 +258,21 @@ class UserGroup
         return true;
     }
 
+    public function isUser(): bool
+    {
+        return false;
+    }
+
+    /**
+     * Return a locale for the userGroup.
+     *
+     * Currently hardcoded, should be replaced by a property.
+     */
+    public function getLocale(): string
+    {
+        return 'fr';
+    }
+
     public function contains(User $user): bool
     {
         return $this->users->contains($user);