Merge branch 'dev' into module_profiler

modules/Categories/Entities/Category.php

@@ -28,6 +28,6 @@ class Category extends Entity
 
     public function content()
     {
-        return $this->hasMany(Content::class);
+        return $this->hasMany(Content::class, 'categoryId');
     }
 }

modules/ContactForm/Widgets/Form/Presenter.php

@@ -32,8 +32,6 @@ class Presenter implements WidgetRenderer
             return null;
         }
 
-        $form->moduleSettings = json_decode($form->moduleSettings);
-
         return view(self::$template, ['widget' => $widget, 'form' => $form]);
     }