Merge remote-tracking branch 'upstream/develop' into separated-confirm

diff --cc src/App/Router.php
index 3f576d7c53b24f9ea5ad9c4fca6d5d1e62a0d6af,8373273b78b228d1cec20633a1ad2161333fe872..a71f9f0f8ce291b79ce797ff13f7dfe3d0b54604
--- 1/src/App/Router.php
--- 2/src/App/Router.php
+++ b/src/App/Router.php
@@@ -109,10 -109,11 +109,12 @@@ class Route
                        $collector->addRoute(['GET'], '/{guid}/status_message',              Module\Diaspora\Fetch::class);
                        $collector->addRoute(['GET'], '/{guid}/reshare',                     Module\Diaspora\Fetch::class);
                });
-               $this->routeCollector->addRoute(['GET'],         '/filer[/{id:\d+}]',    Module\Filer::class);
+               $this->routeCollector->addRoute(['GET'],         '/filer[/{id:\d+}]',    Module\Filer\SaveTag::class);
+               $this->routeCollector->addRoute(['GET'],         '/filerm/{id:\d+}',     Module\Filer\RemoveTag::class);
 +              $this->routeCollector->addRoute(['GET', 'POST'], '/follow_confirm',      Module\FollowConfirm::class);
                $this->routeCollector->addRoute(['GET'],         '/followers/{owner}',   Module\Followers::class);
                $this->routeCollector->addRoute(['GET'],         '/following/{owner}',   Module\Following::class);
+               $this->routeCollector->addRoute(['GET'],         '/friendica[/json]',    Module\Friendica::class);
                $this->routeCollector->addGroup('/group', function (RouteCollector $collector) {
                        $collector->addRoute(['GET', 'POST'], '[/]',                         Module\Group::class);
                        $collector->addRoute(['GET', 'POST'], '/{group:\d+}',                Module\Group::class);