Merge branch 'master' into bug/image-upload

diff --cc app/Http/Controllers/ImageController.php
index 17e690813791c4088ef4f77078e19ccc23b5be24,d71e383461bb025474f441b0ba691b55a4d00d47..9782a94c42dfcbbb39a8b23690d3f7c34cc57708
--- 1/app/Http/Controllers/ImageController.php
--- 2/app/Http/Controllers/ImageController.php
+++ b/app/Http/Controllers/ImageController.php
@@@ -120,7 -120,7 +120,7 @@@ class ImageController extends Controlle
      {
          $this->checkPermission('image-create-all');
          $this->validate($request, [
-             'file' => 'image'
 -            'file' => 'required|is_image'
++            'file' => 'required|image'
          ]);
  
          if (!$this->imageRepo->isValidType($type)) {

diff --cc resources/assets/sass/_components.scss
Simple merge

diff --cc resources/assets/sass/_pages.scss
Simple merge