Merge branch 'develop'

Resolver/MerchantResolver.php

 
     public function getUrl(SectionInterface $section)
     {
-        if ($this->urlResolver->isServerLocalhost()) {
-            return $this->router->generate('frontend_home', ['section' => $section->getSlug()], UrlGeneratorInterface::ABSOLUTE_URL);
-        } else {
-            return $this->settingSolver->getSettingValue($section->getMerchant(), MerchantSettingDefinition::SETTING_URL);
+        $url = $this->settingSolver->getSettingValue($section->getMerchant(), MerchantSettingDefinition::SETTING_URL);
+
+        if(!$section->getIsDefault()) {
+            $url .= $section->getSlug();
         }
+
+        return$url;
     }
 
     public function getMerchantUser(UserInterface $user = null)