diff --git a/HACKING.rst b/HACKING.rst
index 04bb5635e..d14f0f0ef 100644
--- a/HACKING.rst
+++ b/HACKING.rst
@@ -3,7 +3,7 @@ Hacking
 
 This is a guide about how to start hacking on *LibrePlan* project.
 If you want more information about *LibrePlan* development you should visit the wiki
-available at: http://wiki.libreplan.org/.
+available at: https://wiki.libreplan.dev/.
 
 .. contents::
 
diff --git a/NEWS.rst b/NEWS.rst
index 33764cf2a..55719db8c 100644
--- a/NEWS.rst
+++ b/NEWS.rst
@@ -2096,8 +2096,8 @@ Changes
 * Update database scripts for LibrePlan 1.2.2
 * Remove some unneeded lines in libreplan.spec
 * Remove some unneeded lines in libreplan.spec
-* www: Add new README files for Fedora and openSUSE in libreplan.org
-* www: Add new README files for Fedora and openSUSE in libreplan.org
+* www: Add new README files for Fedora and openSUSE in libreplan.dev
+* www: Add new README files for Fedora and openSUSE in libreplan.dev
 * Rename database scripts to create database and user
 * Prepare libreplan spec file for the release 1.2.2.
 * Add LibrePlan RPM spec file
@@ -2426,8 +2426,8 @@ Changes
 * Bug #1327: Fix issue changing method to do reassignments in consolidation process
 * Modify GenericDayAssignment.toString to add info about consolidation
 * Bug #1327: Fix issue changing method to do reassignments in consolidation process
-* www: Folder and script for libreplan.org documentation
-* www: Folder and script for libreplan.org documentation
+* www: Folder and script for libreplan.dev documentation
+* www: Folder and script for libreplan.dev documentation
 * [Bug #1326] Fix issue calculating properly hours to allocate
 * [Bug #1326] Fix issue calculating properly hours to allocate
 * [Bug #1325] Fix issue remove criteria from configuration unit
@@ -3112,7 +3112,7 @@ Changes
 * Update Debian package for LibrePlan 1.2.2
 * Update database scripts for LibrePlan 1.2.2
 * Remove some unneeded lines in libreplan.spec
-* www: Add new README files for Fedora and openSUSE in libreplan.org
+* www: Add new README files for Fedora and openSUSE in libreplan.dev
 * Rename database scripts to create database and user
 * Prepare libreplan spec file for the release 1.2.2.
 * Add LibrePlan RPM spec file
@@ -3319,7 +3319,7 @@ Changes
 * Bug #1261: Extract method createTab with common functionality for each tab
 * Bug #1261: Allows tabs to be memorized when changing perspective
 * Bug #1327: Fix issue changing method to do reassignments in consolidation process
-* www: Folder and script for libreplan.org documentation
+* www: Folder and script for libreplan.dev documentation
 * [Bug #1326] Fix issue calculating properly hours to allocate
 * [Bug #1325] Fix issue remove criteria from configuration unit
 * Allow reported hours bar in gantt diagram to be wider than the task.
diff --git a/README.rst b/README.rst
index 5dc56ba3f..d11268a25 100644
--- a/README.rst
+++ b/README.rst
@@ -132,16 +132,16 @@ Webpage
 -------
 
 You can find more information about *LibrePlan* at
-http://www.libreplan.org/home/
+https://www.libreplan.dev/home/
 
 For information related with *LibrePlan* development you can visit the wiki at
-http://wiki.libreplan.org/twiki/bin/view/LibrePlan
+https://wiki.libreplan.dev
 
 
 Reporting bugs
 --------------
 
-Please use the bug tracker to report bugs at http://bugs.libreplan.org/
+Please use the bug tracker to report bugs at http://bugs.libreplan.dev/
 
 
 License
diff --git a/README_fr.rst b/README_fr.rst
index 5e5e50b03..083dd32d3 100644
--- a/README_fr.rst
+++ b/README_fr.rst
@@ -116,13 +116,13 @@ Vous pourrez trouver plus d'informations concernant *LibrePlan* sur
 http://www.libreplan.com/.
 
 Pour les informations relatives au développement de *LibrePlan*, vous pouvez aller sur le wiki sur
-http://wiki.libreplan.org/.
+https://wiki.libreplan.dev/.
 
 
 Signaler des bugs
 -----------------
 
-Merci d'utiliser le gestionnaire de bugs pour signaler les bugs sur http://bugs.libreplan.org/.
+Merci d'utiliser le gestionnaire de bugs pour signaler les bugs sur http://bugs.libreplan.dev/.
 
 
 Licence
diff --git a/TODO.rst b/TODO.rst
index ca7b4d133..a505debdd 100644
--- a/TODO.rst
+++ b/TODO.rst
@@ -93,9 +93,9 @@ Future & wish list
 
   * *Complete the configuration unit mechanism for machines*: Several analysis stories not started have been written for this:
 
-    * `AnA17S01ConfigurationUnitInterfaceCorrections <http://wiki.libreplan.org/twiki/bin/view/LibrePlan/AnA17S01ConfigurationUnitInterfaceCorrections>`_
-    * `AnA17S02TakingIntoAccountDerivedDayAssigments <http://wiki.libreplan.org/twiki/bin/view/LibrePlan/AnA17S02TakingIntoAccountDerivedDayAssigments>`_
-    * `AnA17S03EnforceDerivedDayAssignmentsWithAllocations <http://wiki.libreplan.org/twiki/bin/view/LibrePlan/AnA17S03EnforceDerivedDayAssignmentsWithAllocations>`_
+    * `AnA17S01ConfigurationUnitInterfaceCorrections <https://github.com/LibrePlan/twiki2github/wiki/AnA17S01ConfigurationUnitInterfaceCorrections>`_
+    * `AnA17S02TakingIntoAccountDerivedDayAssigments <https://github.com/LibrePlan/twiki2github/wiki/AnA17S02TakingIntoAccountDerivedDayAssigments>`_
+    * `AnA17S03EnforceDerivedDayAssignmentsWithAllocations <https://github.com/LibrePlan/twiki2github/wiki/AnA17S03EnforceDerivedDayAssignmentsWithAllocations>`_
 
   * *Allow to reassign just one task*
 
diff --git a/debian/libreplan.postinst b/debian/libreplan.postinst
index 14fd53d97..0ca2ec55a 100644
--- a/debian/libreplan.postinst
+++ b/debian/libreplan.postinst
@@ -120,6 +120,6 @@ fi
 
 echo 'Please review the Tomcat6 memory configuration in your server at /etc/default/tomcat6 file.
 Furthermore, in order to have printing working properly if you are in Debian Squeeze you have to install CutyCapt package from Wheezy (testing).
-You can find more information about these issues at INSTALL file or in the following link: http://libreplan.org/INSTALL.html'
+You can find more information about these issues at INSTALL file or in the following link: https://libreplan.dev/INSTALL.html'
 
 #DEBHELPER#
diff --git a/doc/src/technical/guia-desenvolvemento/guia-integracion-terceiros.rst b/doc/src/technical/guia-desenvolvemento/guia-integracion-terceiros.rst
index c90e02b6e..d90085695 100644
--- a/doc/src/technical/guia-desenvolvemento/guia-integracion-terceiros.rst
+++ b/doc/src/technical/guia-desenvolvemento/guia-integracion-terceiros.rst
@@ -233,7 +233,7 @@ Se existe un erro de programación que xorde froito da invocación dun servizo n
 ::
 
   <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-    <internal-error xmlns="http://rest.ws.libreplan.org"
+    <internal-error xmlns="http://rest.ws.libreplan.dev"
      message="">
     <stack-trace>
     </stack-trace>
@@ -312,7 +312,7 @@ Os fluxos de integración detallan a secuencia que ten que facer unha aplicació
 Os servizos web atópanse dispoñibles a partir da URL_BASE da aplicación en /ws/rest/:
 
    * URL Base de Servizos: URL_BASE_LIBREPLAN_WEBAPP/ws/rest
-   * Exemplo: http://www.libreplan.org/libreplan-webapp/ws/rest
+   * Exemplo: https://www.libreplan.dev/libreplan-webapp/ws/rest
 
 A partir deste intre denominase a esta URL de servizos coma *BASE_SERVICES_URL*.
 
@@ -356,7 +356,7 @@ Descrición do fluxo
 Exemplo de ficheiro de importación
  ::
 
-  <material-units-list xmlns="http://rest.ws.libreplan.org">
+  <material-units-list xmlns="http://rest.ws.libreplan.dev">
      <material-unit code="10" name="Unidades"/>
      <material-unit code="20" name="M3"/>
      <material-unit code="30" name="Metros Lineales"/>
@@ -364,7 +364,7 @@ Exemplo de ficheiro de importación
 
 
 
-  <material-category-list xmlns="http://rest.ws.libreplan.org">
+  <material-category-list xmlns="http://rest.ws.libreplan.dev">
     <material-category code="10" name="Tornillos" >
        <material-list>
          <material code="TOR12" description="Tornillos Serie-12" price="123.12" unit-type="10" disabled="false"/>
@@ -428,7 +428,7 @@ Descrición do fluxo
 Exemplo de ficheiro de importación
  ::
 
-  <labels-type-list xmlns="http://rest.ws.libreplan.org">
+  <labels-type-list xmlns="http://rest.ws.libreplan.dev">
     <label-type code="10" name="Prioridad" >
        <labels-list>
          <label code="1001" name="Baja" />
@@ -492,7 +492,7 @@ Descrición do fluxo
 
 Información de realización da chamada
    * *URL Servizo*: BASE_SERVICE_URL/criteriontypes
-   * *Exemplo URL*:http://www.libreplan.org/libreplan-webapp/ws/rest/services/criteriontypes
+   * *Exemplo URL*:https://www.libreplan.dev/libreplan-webapp/ws/rest/services/criteriontypes
    * *Método POST*
 
 Descrición do formato do ficheiro XML::
@@ -524,7 +524,7 @@ Exemplo de ficheiro de importación
 
   <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 
-  <criterion-type-list xmlns="http://rest.ws.libreplan.org">
+  <criterion-type-list xmlns="http://rest.ws.libreplan.dev">
     <criterion-type code="CRITYPE4" name="ct-4" description="ct-4 desc" allow-hierarchy="true"
         allow-simultaneous-criterions-per-resource="true" enabled="true"
         resource="RESOURCE">
@@ -583,7 +583,7 @@ Descrición do fluxo
 Exemplo de ficheiro de importación
  ::
 
-  <hours-type-list xmlns="http://rest.ws.libreplan.org">
+  <hours-type-list xmlns="http://rest.ws.libreplan.dev">
     <hours-type code="12" name="Ordinaria" default-price="10.2" enabled="true" />
     <hours-type code="13" name="Extra" default-price="14.2" enabled="true" />
     <hours-type code="14" name="Nocturna" default-price="14.2" enabled="true" />
@@ -631,7 +631,7 @@ Exemplo de ficheiro de importación
  ::
 
   <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-  <cost-category-list xmlns="http://rest.ws.libreplan.org">
+  <cost-category-list xmlns="http://rest.ws.libreplan.dev">
     <cost-category enabled="true" name="Categoria A"
     code="18d6ef79-5b45-4928-bfd5-ec80a374699c">
       <hour-cost-list>
@@ -699,7 +699,7 @@ Descrición do fluxo
 
 Información de realización da chamada
    * *URL Servizo*: BASE_SERVICE_URL/resources
-   * *Exemplo URL*:http://www.libreplan.org/libreplan-webapp/ws/rest/services/resources
+   * *Exemplo URL*:https://www.libreplan.dev/libreplan-webapp/ws/rest/services/resources
    * *Método POST*
 
 Descrición do formato do ficheiro XML::
@@ -744,7 +744,7 @@ Exemplo de ficheiro de importación
 
   <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 
-  <resource-list xmlns="http://rest.ws.libreplan.org">
+  <resource-list xmlns="http://rest.ws.libreplan.dev">
     <!-- [It assumes existence of "TestLocationGroupCriterion" and
          "TestCostCategory"] OK. -->
     <machine code="machineA" name="name" description="desc">
@@ -830,7 +830,7 @@ Descrición do fluxo
 Exemplo de ficheiro de importación:
  ::
 
-  <work-report-list xmlns="http://rest.ws.libreplan.org">
+  <work-report-list xmlns="http://rest.ws.libreplan.dev">
    <work-report code="312321" work-report-type="30" @date="2009-10-21" @resource="121" work-order="4323">
     <label-list>
       <label code="adfsdf" value="urxente" type="prioridade"/>
@@ -909,7 +909,7 @@ Exemplo de ficheiro de importación
  ::
 
   <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-  <order-lists xmlns="http://rest.ws.libreplan.org">
+  <order-lists xmlns="http://rest.ws.libreplan.dev">
    <order code="ORDER-1" name="Order" init-date="2010-01-01" deadline="2010-05-30">
     <label-list>
      <label code="10" name="low" type="priority" />
@@ -1029,7 +1029,7 @@ Exemplo de ficheiro de importación
  ::
 
   <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-  <base-calendar-list xmlns="http://rest.ws.libreplan.org">
+  <base-calendar-list xmlns="http://rest.ws.libreplan.dev">
   <base-calendar name="Spanish Calendar" code="000-001">
       <calendar-exception-list>
         <calendar-exception calendar-exception-type-code="BANK_HOLIDAY"
@@ -1134,7 +1134,7 @@ Exemplo de ficheiro de importación
  ::
 
   <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-  <type-work-hours-list xmlns="http://rest.ws.libreplan.org">
+  <type-work-hours-list xmlns="http://rest.ws.libreplan.dev">
   <!-- Ok-->
     <type-work-hours enabled="true" defaultPrice="8.00" name="Hora Extra" code="t1" />
 
@@ -1201,7 +1201,7 @@ Descrición do fluxo
 Exemplo de ficheiro de exportación:
  ::
 
-  <resource-worked-hours-list xmlns="http://rest.ws.libreplan.org" start-date="2009-10-01" end-date="2009-10-31">
+  <resource-worked-hours-list xmlns="http://rest.ws.libreplan.dev" start-date="2009-10-01" end-date="2009-10-31">
    <resource-worked-hours resource="321" hours="160" >
    <resource-worked-hours resource="322" hours="165" >
    <resource-worked-hours resource="323" hours="142" >
@@ -1238,7 +1238,7 @@ Descrición do fluxo
 Exemplo de ficheiro de exportación:
  ::
 
-  <calendar-exception-type-list xmlns="http://rest.ws.libreplan.org">
+  <calendar-exception-type-list xmlns="http://rest.ws.libreplan.dev">
     <calendar-exception-type over-assignable="false" color="red"
       name="BANK_HOLIDAY" code="BANK_HOLIDAY" />
     <calendar-exception-type over-assignable="false" color="red"
@@ -1294,7 +1294,7 @@ Exemplo de ficheiro de importación
  ::
 
   <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-   <subcontracted-task-data xmlns="http://rest.ws.libreplan.org" work-description="Pedido de 100 puertas"
+   <subcontracted-task-data xmlns="http://rest.ws.libreplan.dev" work-description="Pedido de 100 puertas"
     subcontracted-code="REFERENCE-CODE-1" subcontracted-price="152200.03" external-company-nif="B15323232">
     <materials>
      <material code="MAT-1" material-reference="MATERIAL-1" name="Tuercas 2x20" descripcion="Tuercas moi resistentes"  unit-price="10.5"/>
@@ -1368,7 +1368,7 @@ Exemplo de ficheiro de importación de avances.
  ::
 
   <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-   <subcontracted-task-data xmlns="http://rest.ws.libreplan.org" work-description="Pedido de 100 puertas"
+   <subcontracted-task-data xmlns="http://rest.ws.libreplan.dev" work-description="Pedido de 100 puertas"
     subcontracted-code="REFERENCE-CODE-1" subcontracted-price="152200.03" external-company-nif="B15323232">
    <children>
     <order-line-group code="ORDER-1-OE-1" name="Order element 1" description="Descripcion">
@@ -1412,7 +1412,7 @@ O seguinte script permite interactuar co servizo de importación de recursos emp
  #!/bin/sh
 
  DEVELOPMENT_BASE_SERVICE_URL=http://localhost:8080/libreplan-webapp/ws/rest
- PRODUCTION_BASE_SERVICE_URL=http://www.libreplan.org/libreplan-webapp/ws/rest
+ PRODUCTION_BASE_SERVICE_URL=https://www.libreplan.dev/libreplan-webapp/ws/rest
 
  DEVELOPMENT_CERTIFICATE=""
  PRODUCTION_CERTIFICATE=-k
@@ -1455,7 +1455,7 @@ O seguinte código de exemplo fai unha petición por GET que nos devolve o lista
  #!/bin/sh
 
  DEVELOPMENT_BASE_SERVICE_URL=http://localhost:8080/libreplan-webapp/ws/rest
- PRODUCTION_BASE_SERVICE_URL=http://www.libreplan.org/libreplan-webapp/ws/rest
+ PRODUCTION_BASE_SERVICE_URL=https://www.libreplan.dev/libreplan-webapp/ws/rest
 
  DEVELOPMENT_CERTIFICATE=""
  PRODUCTION_CERTIFICATE=-k
diff --git a/doc/src/technical/howto-develop-a-use-case-in-libreplan.rst b/doc/src/technical/howto-develop-a-use-case-in-libreplan.rst
index b4529700c..8ff72c535 100644
--- a/doc/src/technical/howto-develop-a-use-case-in-libreplan.rst
+++ b/doc/src/technical/howto-develop-a-use-case-in-libreplan.rst
@@ -2642,7 +2642,7 @@ provided in order to check implementation.
 .. _CRUD: http://en.wikipedia.org/wiki/Create,_read,_update_and_delete
 .. _Hibernate: http://www.hibernate.org/
 .. _`Optimistic Locking`: http://en.wikipedia.org/wiki/Optimistic_locking
-.. _`LibrePlan wiki`: http://wiki.libreplan.org/
+.. _`LibrePlan wiki`: https://wiki.libreplan.dev/
 .. _MVC: http://en.wikipedia.org/wiki/Model_view_controller
 .. _DAO: http://en.wikipedia.org/wiki/Data_Access_Object
 .. _DDD: http://en.wikipedia.org/wiki/Domain_driven_design
diff --git a/doc/src/technical/howto-install-libreplan-from-deb.txt b/doc/src/technical/howto-install-libreplan-from-deb.txt
index aa21ca18c..afc6452cb 100644
--- a/doc/src/technical/howto-install-libreplan-from-deb.txt
+++ b/doc/src/technical/howto-install-libreplan-from-deb.txt
@@ -2,10 +2,10 @@ Lista de comandos para la instalación de pruebas de la aplicación libreplan so
 
 sudo apt-get install postgresql postgresql-client dbconfig-common tomcat6  openjdk-6-jre-headless  openjdk-6-jre libpg-java
 sudo apt-get install libqt4-webkit libqt4-svg xvfb
-wget http://libreplan.org/downloads/cutycapt_20100108_i386.deb
+wget https://libreplan.dev/downloads/cutycapt_20100108_i386.deb
 sudo dpkg -i cutycapt_20100108_i386.deb
 sudo ln -s /usr/share/java/postgresql-jdbc3-8.2.jar /usr/share/tomcat6/lib
-wget wget http://libreplan.org/downloads/libreplan_20100415_all.deb
+wget wget https://libreplan.dev/downloads/libreplan_20100415_all.deb
 sudo dpkg -i libreplan_20100415_all.deb
 
    Configurar base de datos:	Si
diff --git a/doc/src/technical/howto-install-libreplan.txt b/doc/src/technical/howto-install-libreplan.txt
index b5dd3b010..cf937b23c 100644
--- a/doc/src/technical/howto-install-libreplan.txt
+++ b/doc/src/technical/howto-install-libreplan.txt
@@ -21,7 +21,7 @@ $ sudo apt-get install libqt4-webkit libqt4-svg xvfb
 
 Descargamos a utilidade CutyCapt
 
-$ wget http://libreplan.org/downloads/cutycapt_20100108_i386.deb
+$ wget https://libreplan.dev/downloads/cutycapt_20100108_i386.deb
 
 Instalamos CutyCapt
 
@@ -83,7 +83,7 @@ Instalamos a librería de acceso a jdbc a postgresql en tomcat, o jar está no p
 Instalamos a última versión da aplicación no tomcat
 
 $ cd /var/lib/tomcat6/webapps
-$ sudo wget http://libreplan.org/downloads/libreplan-webapp.war
+$ sudo wget https://libreplan.dev/downloads/libreplan-webapp.war
 $ sudo chown tomcat6.tomcat6 libreplan-webapp.war
 
 Reiniciamos o tomcat para que recolla todas as modificacións da configuración:
diff --git a/ganttzk/src/main/resources/i18n/zh.po b/ganttzk/src/main/resources/i18n/zh.po
index b94b3a81b..b1a262ade 100644
--- a/ganttzk/src/main/resources/i18n/zh.po
+++ b/ganttzk/src/main/resources/i18n/zh.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: libreplan-1.3.3\n"
-"Report-Msgid-Bugs-To: http://bugs.libreplan.org/\n"
+"Report-Msgid-Bugs-To: http://bugs.libreplan.dev/\n"
 "POT-Creation-Date: 2012-12-07 13:59+0100\n"
 "PO-Revision-Date: 2013-03-09 07:49+0000\n"
 "Last-Translator: Swanson Chan <lacidophilin@yahoo.com>\n"
diff --git a/libreplan-business/src/main/java/org/libreplan/business/common/VersionInformation.java b/libreplan-business/src/main/java/org/libreplan/business/common/VersionInformation.java
index 6d706ce0b..fdd6981c1 100644
--- a/libreplan-business/src/main/java/org/libreplan/business/common/VersionInformation.java
+++ b/libreplan-business/src/main/java/org/libreplan/business/common/VersionInformation.java
@@ -45,7 +45,7 @@ public class VersionInformation {
     /**
      * URL with a text file only with last number version of LibrePlan.
      */
-    private static final String LIBREPLAN_VERSION_URL = "http://libreplan.org/VERSION";
+    private static final String LIBREPLAN_VERSION_URL = "https://libreplan.dev/VERSION";
 
 
     /**
diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/users/services/LDAPCustomAuthenticationProvider.java b/libreplan-webapp/src/main/java/org/libreplan/web/users/services/LDAPCustomAuthenticationProvider.java
index 7b8e4fdc0..56a1975cf 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/users/services/LDAPCustomAuthenticationProvider.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/users/services/LDAPCustomAuthenticationProvider.java
@@ -58,7 +58,7 @@ import org.springframework.transaction.annotation.Transactional;
  * used to implement the authentication against LDAP.
  *
  * This provider implements the process explained in
- * <https://wiki.libreplan.org/twiki/bin/view/LibrePlan/AnA04S06LdapAuthentication>
+ * <https://github.com/LibrePlan/twiki2github/wiki/AnA04S06LdapAuthentication>
  *
  * At this time it authenticates user against LDAP and then searches it in BD to
  * use the BD user in application.
diff --git a/libreplan-webapp/src/main/java/org/libreplan/ws/common/api/WSCommonGlobalNames.java b/libreplan-webapp/src/main/java/org/libreplan/ws/common/api/WSCommonGlobalNames.java
index be0d941a1..61845faf5 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/ws/common/api/WSCommonGlobalNames.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/ws/common/api/WSCommonGlobalNames.java
@@ -29,7 +29,7 @@ package org.libreplan.ws.common.api;
 public class WSCommonGlobalNames {
 
     public final static String REST_NAMESPACE =
-        "http://rest.ws.libreplan.org";
+        "http://rest.ws.libreplan.dev";
 
     private WSCommonGlobalNames() {}
 
diff --git a/libreplan-webapp/src/main/resources/i18n/zh.po b/libreplan-webapp/src/main/resources/i18n/zh.po
index 957c5df05..99169eb23 100644
--- a/libreplan-webapp/src/main/resources/i18n/zh.po
+++ b/libreplan-webapp/src/main/resources/i18n/zh.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: libreplan-1.3.3\n"
-"Report-Msgid-Bugs-To: http://bugs.libreplan.org/\n"
+"Report-Msgid-Bugs-To: http://bugs.libreplan.dev/\n"
 "POT-Creation-Date: 2012-12-07 13:59+0100\n"
 "PO-Revision-Date: 2013-03-12 07:35+0000\n"
 "Last-Translator: Swanson Chan <lacidophilin@yahoo.com>\n"
diff --git a/scripts/rest-clients/README.rst b/scripts/rest-clients/README.rst
index 9f88ea386..6f2c5bd17 100644
--- a/scripts/rest-clients/README.rst
+++ b/scripts/rest-clients/README.rst
@@ -108,7 +108,7 @@ the server to execute the tests:
 Demo environment (``without parameters``) - default
 
   Use server where demo is launched using the following URL:
-  ``http://demo.libreplan.org/libreplan/``
+  ``http://demo.libreplan.dev/libreplan/``
 
   Example::
 
diff --git a/scripts/rest-clients/calendar-exception-type-sample.xml b/scripts/rest-clients/calendar-exception-type-sample.xml
index 2257eec82..f1c1797c5 100644
--- a/scripts/rest-clients/calendar-exception-type-sample.xml
+++ b/scripts/rest-clients/calendar-exception-type-sample.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<calendar-exception-type-list xmlns="http://rest.ws.libreplan.org">
+<calendar-exception-type-list xmlns="http://rest.ws.libreplan.dev">
 
   <calendar-exception-type code="HALF_DAY" name="Half day"
     color="GREEN" duration="14400" over-assignable="true" />
diff --git a/scripts/rest-clients/calendars-sample.xml b/scripts/rest-clients/calendars-sample.xml
index 5b17a5869..e26caab27 100644
--- a/scripts/rest-clients/calendars-sample.xml
+++ b/scripts/rest-clients/calendars-sample.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<base-calendar-list xmlns="http://rest.ws.libreplan.org">
+<base-calendar-list xmlns="http://rest.ws.libreplan.dev">
 <base-calendar name="Spanish Calendar" code="000-001">
     <calendar-exception-list>
       <calendar-exception calendar-exception-type-code="BANK_HOLIDAY"
diff --git a/scripts/rest-clients/cost-categories-sample.xml b/scripts/rest-clients/cost-categories-sample.xml
index ccd598e3f..e9f5dae4c 100644
--- a/scripts/rest-clients/cost-categories-sample.xml
+++ b/scripts/rest-clients/cost-categories-sample.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<cost-category-list xmlns="http://rest.ws.libreplan.org">
+<cost-category-list xmlns="http://rest.ws.libreplan.dev">
   <cost-category enabled="true" name="Categoria A"
   code="18d6ef79-5b45-4928-bfd5-ec80a374699c">
     <hour-cost-list>
diff --git a/scripts/rest-clients/criterion-types-sample.xml b/scripts/rest-clients/criterion-types-sample.xml
index 8314d6b6b..d79e41a2a 100644
--- a/scripts/rest-clients/criterion-types-sample.xml
+++ b/scripts/rest-clients/criterion-types-sample.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 
-<criterion-type-list xmlns="http://rest.ws.libreplan.org">
+<criterion-type-list xmlns="http://rest.ws.libreplan.dev">
 
     <!-- Several errors: see comments -->
     <criterion-type code="ct-1" name="ct-1" description="ct-1 desc"
diff --git a/scripts/rest-clients/criterion-types-update-sample.xml b/scripts/rest-clients/criterion-types-update-sample.xml
index f7c1cd1dc..7cef35db1 100644
--- a/scripts/rest-clients/criterion-types-update-sample.xml
+++ b/scripts/rest-clients/criterion-types-update-sample.xml
@@ -6,7 +6,7 @@
      criterion-types-sample.xml first, and then
      criterion-types-update-sample.xml). -->
 
-<criterion-type-list xmlns="http://rest.ws.libreplan.org">
+<criterion-type-list xmlns="http://rest.ws.libreplan.dev">
 
     <!-- OK (change criterion type's name and description, move criterion
          "ct-4-c2-1-1" of position in the criterion hierarchy and set active to
diff --git a/scripts/rest-clients/label-sample.xml b/scripts/rest-clients/label-sample.xml
index 341d452d0..2067052fc 100644
--- a/scripts/rest-clients/label-sample.xml
+++ b/scripts/rest-clients/label-sample.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<label-type-list xmlns="http://rest.ws.libreplan.org">
+<label-type-list xmlns="http://rest.ws.libreplan.dev">
   <label-type name="Centro de coste"
   code="a3636840-33ed-4e25-8ffd-6f98aa72df2a">
     <label-list>
diff --git a/scripts/rest-clients/material-categories-sample.xml b/scripts/rest-clients/material-categories-sample.xml
index f30b1ffd1..91139af85 100644
--- a/scripts/rest-clients/material-categories-sample.xml
+++ b/scripts/rest-clients/material-categories-sample.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<material-category-list xmlns="http://rest.ws.libreplan.org">
+<material-category-list xmlns="http://rest.ws.libreplan.dev">
   <material-category code="10" name="Screws" >
      <material-list>
        <material code="SCREW12" description="Screws Serie-12" price="123.12" unit-type="10" disabled="false"/>
diff --git a/scripts/rest-clients/order-sample.xml b/scripts/rest-clients/order-sample.xml
index 21585a0aa..c8994daa9 100644
--- a/scripts/rest-clients/order-sample.xml
+++ b/scripts/rest-clients/order-sample.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 
-<order-list xmlns="http://rest.ws.libreplan.org">
+<order-list xmlns="http://rest.ws.libreplan.dev">
   <order
     code="ORDER-1" name="Order" init-date="2010-01-01">
     <children>
diff --git a/scripts/rest-clients/order-update-sample.xml b/scripts/rest-clients/order-update-sample.xml
index a8dd9ca3e..7daf7e1a5 100644
--- a/scripts/rest-clients/order-update-sample.xml
+++ b/scripts/rest-clients/order-update-sample.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 
-<order-list xmlns="http://rest.ws.libreplan.org">
-  <order xmlns="http://rest.ws.libreplan.org"
+<order-list xmlns="http://rest.ws.libreplan.dev">
+  <order xmlns="http://rest.ws.libreplan.dev"
     code="ORDER-1" name="Order UPDATED" init-date="2010-01-01">
     <children>
       <order-line-group code="ORDER-1-OE-1" name="Order element 1">
diff --git a/scripts/rest-clients/orders-sample.xml b/scripts/rest-clients/orders-sample.xml
index 3df26636d..7010cc8ec 100644
--- a/scripts/rest-clients/orders-sample.xml
+++ b/scripts/rest-clients/orders-sample.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<order-list xmlns="http://rest.ws.libreplan.org">
+<order-list xmlns="http://rest.ws.libreplan.dev">
   <order calendar-name="Default"
   dependencies-constraints-have-priority="false"
   deadline="2010-03-25T00:00:00+01:00"
diff --git a/scripts/rest-clients/personal-timesheet.xml b/scripts/rest-clients/personal-timesheet.xml
index 16d51dbf7..27070308a 100644
--- a/scripts/rest-clients/personal-timesheet.xml
+++ b/scripts/rest-clients/personal-timesheet.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<personal-timesheet-entry-list xmlns="http://rest.ws.libreplan.org">
+<personal-timesheet-entry-list xmlns="http://rest.ws.libreplan.dev">
     <personal-timesheet-entry effort="8" date="2012-11-08" task="ORDER0001-0001"/>
 </personal-timesheet-entry-list>
diff --git a/scripts/rest-clients/resource-withCalendars-sample.xml b/scripts/rest-clients/resource-withCalendars-sample.xml
index 78e110918..91fe37f2c 100644
--- a/scripts/rest-clients/resource-withCalendars-sample.xml
+++ b/scripts/rest-clients/resource-withCalendars-sample.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<resource-list xmlns="http://rest.ws.libreplan.org">
+<resource-list xmlns="http://rest.ws.libreplan.dev">
   <worker nif="71717171G" surname="Gómez" first-name="Perico"
   code="263bc2dc-cb89-43b6-8a8b-478ed90fb092">
     <calendar capacity="1"
diff --git a/scripts/rest-clients/resources-sample-mini.xml b/scripts/rest-clients/resources-sample-mini.xml
index 3ce29751a..0e351a141 100644
--- a/scripts/rest-clients/resources-sample-mini.xml
+++ b/scripts/rest-clients/resources-sample-mini.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 
-<resource-list xmlns="http://rest.ws.libreplan.org">
+<resource-list xmlns="http://rest.ws.libreplan.dev">
 
     <!-- [It assumes existence of "TestLocationGroupCriterion" and
          "TestCostCategory"] OK. -->
diff --git a/scripts/rest-clients/resources-sample.xml b/scripts/rest-clients/resources-sample.xml
index 9f4201ab8..2a2387433 100644
--- a/scripts/rest-clients/resources-sample.xml
+++ b/scripts/rest-clients/resources-sample.xml
@@ -5,7 +5,7 @@
     complete list of test cases.
  -->
 
-<resource-list xmlns="http://rest.ws.libreplan.org">
+<resource-list xmlns="http://rest.ws.libreplan.dev">
 
     <!--  *** Machines *** -->
 
diff --git a/scripts/rest-clients/resources-update-sample.xml b/scripts/rest-clients/resources-update-sample.xml
index a0cb21f19..37109fb5e 100644
--- a/scripts/rest-clients/resources-update-sample.xml
+++ b/scripts/rest-clients/resources-update-sample.xml
@@ -6,7 +6,7 @@
      resources-sample-mini.xml first, and then
      resources-update-sample.xml). -->
 
-<resource-list xmlns="http://rest.ws.libreplan.org">
+<resource-list xmlns="http://rest.ws.libreplan.dev">
 
     <!-- OK (change name, machineA-s1's start date, and machineA-a2's start
          date). -->
diff --git a/scripts/rest-clients/rest-common-env.sh b/scripts/rest-clients/rest-common-env.sh
index d783bd377..8e793f4b4 100755
--- a/scripts/rest-clients/rest-common-env.sh
+++ b/scripts/rest-clients/rest-common-env.sh
@@ -1,4 +1,4 @@
-DEMO_BASE_SERVICE_URL=http://demo.libreplan.org/libreplan/ws/rest
+DEMO_BASE_SERVICE_URL=http://demo.libreplan.dev/libreplan/ws/rest
 DEVELOPMENT_BASE_SERVICE_URL=http://localhost:8080/libreplan-webapp/ws/rest
 PRODUCTION_BASE_SERVICE_URL=http://localhost:8080/libreplan/ws/rest
 
diff --git a/scripts/rest-clients/type-work-hours-sample.xml b/scripts/rest-clients/type-work-hours-sample.xml
index bbc4afcf6..60f440da5 100644
--- a/scripts/rest-clients/type-work-hours-sample.xml
+++ b/scripts/rest-clients/type-work-hours-sample.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<type-work-hours-list xmlns="http://rest.ws.libreplan.org">
+<type-work-hours-list xmlns="http://rest.ws.libreplan.dev">
 <!-- Ok-->
   <type-work-hours enabled="true" defaultPrice="8.00" name="Hora Extra" code="t1" />
 
diff --git a/scripts/rest-clients/unit-types-sample.xml b/scripts/rest-clients/unit-types-sample.xml
index 28efd3354..a33c4e674 100644
--- a/scripts/rest-clients/unit-types-sample.xml
+++ b/scripts/rest-clients/unit-types-sample.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<unit-type-list xmlns="http://rest.ws.libreplan.org">
+<unit-type-list xmlns="http://rest.ws.libreplan.dev">
   <unit-type measure="units" code="000-001" />
   <unit-type measure="kg" code="000-002" />
   <unit-type measure="km" code="000-003" />
diff --git a/scripts/rest-clients/work-reports-sample.xml b/scripts/rest-clients/work-reports-sample.xml
index 3c5c1bb55..6afd5562d 100644
--- a/scripts/rest-clients/work-reports-sample.xml
+++ b/scripts/rest-clients/work-reports-sample.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<work-report-list xmlns="http://rest.ws.libreplan.org">
+<work-report-list xmlns="http://rest.ws.libreplan.dev">
 
 
 <!-- the type wr1 has got the following structure