Merge branch 'develop' into refactor-entrypoint-jetstream.php

diff --cc src/App.php
index f163230ce8016067b7bfd3b0041289c9e1f46682,0afdf8bd4204e7cf1966e833fe7734d9f75f1109..15d2cd95400c5bd7c365e7ccd6b10508f2a5c7ea
--- 1/src/App.php
--- 2/src/App.php
+++ b/src/App.php
@@@ -15,10 -15,9 +15,11 @@@ use Friendica\App\Page
  use Friendica\App\Request;
  use Friendica\App\Router;
  use Friendica\Capabilities\ICanCreateResponses;
+ use Friendica\Capabilities\ICanHandleRequests;
  use Friendica\Content\Nav;
 +use Friendica\Core\Addon;
  use Friendica\Core\Config\Factory\Config;
 +use Friendica\Core\Hook;
  use Friendica\Core\KeyValueStorage\Capability\IManageKeyValuePairs;
  use Friendica\Core\Renderer;
  use Friendica\Core\Session\Capability\IHandleUserSessions;