Merge branch 'development' into default-templates

diff --cc app/Entities/Controllers/BookController.php
index 9d8db27e93c29d85c60a4bbde9cca4cc192f565e,55d28c6847e32a1227cb4663902e3388fbb27524..9b938d89a41c7f23fb311d5eedd86c2a0770a36a
--- 1/app/Http/Controllers/BookController.php
--- 2/app/Entities/Controllers/BookController.php
+++ b/app/Entities/Controllers/BookController.php
@@@ -1,12 -1,12 +1,13 @@@
  <?php
  
- namespace BookStack\Http\Controllers;
+ namespace BookStack\Entities\Controllers;
  
- use BookStack\Actions\ActivityQueries;
- use BookStack\Actions\ActivityType;
- use BookStack\Actions\View;
+ use BookStack\Activity\ActivityQueries;
+ use BookStack\Activity\ActivityType;
+ use BookStack\Activity\Models\View;
+ use BookStack\Activity\Tools\UserEntityWatchOptions;
  use BookStack\Entities\Models\Bookshelf;
 +use BookStack\Entities\Models\Page;
  use BookStack\Entities\Repos\BookRepo;
  use BookStack\Entities\Tools\BookContents;
  use BookStack\Entities\Tools\Cloner;

diff --cc app/Entities/Controllers/PageController.php
index 8b131c4f3d8d1f2bd0decc2c855142029745677c,4d8c7e809f9b087a12d5dff8702ec0c5a5d0fbc8..ad75448b34a30fb3fc04a10e435d3607644432e7
--- 1/app/Http/Controllers/PageController.php
--- 2/app/Entities/Controllers/PageController.php
+++ b/app/Entities/Controllers/PageController.php
@@@ -1,9 -1,10 +1,11 @@@
  <?php
  
- namespace BookStack\Http\Controllers;
+ namespace BookStack\Entities\Controllers;
  
- use BookStack\Actions\View;
+ use BookStack\Activity\Models\View;
+ use BookStack\Activity\Tools\CommentTree;
+ use BookStack\Activity\Tools\UserEntityWatchOptions;
 +use BookStack\Entities\Models\Book;
  use BookStack\Entities\Models\Page;
  use BookStack\Entities\Repos\PageRepo;
  use BookStack\Entities\Tools\BookContents;

diff --cc app/Entities/Models/Book.php
Simple merge

diff --cc app/Entities/Repos/PageRepo.php
Simple merge

diff --cc lang/en/entities.php
Simple merge

diff --cc resources/sass/_forms.scss
Simple merge

diff --cc resources/views/books/parts/form.blade.php
Simple merge