Merge branch 'master' of https://github.com/awarre/BookStack into awarre-master

diff --cc app/Entities/Tools/PageContent.php
index ff502d1640c5de2252d4d0c1acbce43255c87133,b0c1f856ffe0f80366d52ed47cbe36997ff07e9d..2c95862657b3c5741a8fbdc75c8dc363836e6c36
--- 1/app/Entities/Tools/PageContent.php
--- 2/app/Entities/Tools/PageContent.php
+++ b/app/Entities/Tools/PageContent.php
@@@ -4,7 -5,9 +5,10 @@@ use BookStack\Entities\Models\Page
  use BookStack\Entities\Tools\Markdown\CustomStrikeThroughExtension;
  use BookStack\Facades\Theme;
  use BookStack\Theming\ThemeEvents;
 +use BookStack\Util\HtmlContentFilter;
+ use BookStack\Uploads\Image;
+ use BookStack\Uploads\ImageRepo;
+ use BookStack\Uploads\ImageService;
  use DOMDocument;
  use DOMNodeList;
  use DOMXPath;