Merge remote-tracking branch 'origin/demo' into luciano

Conflicts:
	app/config/bundles/ik/webservice-bundle/parameters.yml.docker

app/config/bundles/ik/webservice-bundle/parameters.yml.dist

@@ -1,10 +1,14 @@
 parameters:
     url_base: 'http://127.0.0.1/base/app_dev.php' # url app Base
+    url_ftth: 'http://127.0.0.1/ftth/app_dev.php' # url app Base
+    url_mapas: 'http://127.0.0.1/mapas/app_dev.php' # url app Base
 
     client: '%url_base%/api/clients.json'
 
     sidebar_menu: # urls para el sidebar menu 
         Base: '%url_base%'
+        FTTH: '%url_ftth%'
+        Mapas: '%url_mapas%'
 
     # Url base create client
     remote_client_create_url: '%url_base%/admin/client/client/create'

app/config/bundles/ik/webservice-bundle/parameters.yml.docker

@@ -1,7 +1,14 @@
 # This file is auto-generated during the composer install
 parameters:
-    url_base: 'http://%env(HOST_BASE)%/'
+    url_base: 'http://%env(HOST_BASE)%'
+    url_ftth: 'http://%env(HOST_FTTH)%'
+    url_mapas: 'http://%env(HOST_MAPAS)%'
+
     client: '%url_base%/api/clients.json'
-    sidebar_menu:
-        Base: '%url_base%'
+
     remote_client_create_url: '%url_base%/admin/client/client/create'
+
+    sidebar_menu:
+      Base: '%url_base%/'
+      FTTH: '%url_ftth%/'
+      Mapas: '%url_mapas%/'