diff --git a/ganttzk/pom.xml b/ganttzk/pom.xml
index e50985d74..4b93a386a 100644
--- a/ganttzk/pom.xml
+++ b/ganttzk/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.libreplan</groupId>
         <artifactId>libreplan</artifactId>
-        <version>1.4.1</version>
+        <version>1.6.0</version>
     </parent>
     <artifactId>ganttzk</artifactId>
     <packaging>jar</packaging>
@@ -95,6 +95,7 @@
             <groupId>org.xnap.commons</groupId>
             <artifactId>gettext-commons</artifactId>
         </dependency>
+
         <!-- Commons Math-->
         <dependency>
             <groupId>commons-math</groupId>
@@ -104,6 +105,7 @@
             <groupId>joda-time</groupId>
             <artifactId>joda-time</artifactId>
         </dependency>
+
         <!-- Commons Logging -->
         <dependency>
             <groupId>commons-logging</groupId>
@@ -113,7 +115,7 @@
             <groupId>commons-lang</groupId>
             <artifactId>commons-lang</artifactId>
         </dependency>
-         <dependency>
+        <dependency>
            <groupId>commons-collections</groupId>
            <artifactId>commons-collections</artifactId>
          </dependency>
@@ -131,16 +133,19 @@
             <groupId>org.zkoss.zk</groupId>
             <artifactId>zk</artifactId>
         </dependency>
+
         <!-- JGraphT  -->
         <dependency>
             <groupId>org.jgrapht</groupId>
             <artifactId>jgrapht-jdk1.5</artifactId>
         </dependency>
+
         <!-- Junit -->
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
         </dependency>
+
         <!-- Easy mock -->
         <dependency>
             <groupId>org.easymock</groupId>
@@ -162,7 +167,7 @@
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
+            <artifactId>javax.servlet-api</artifactId>
         </dependency>
     </dependencies>
 
diff --git a/libreplan-business/pom.xml b/libreplan-business/pom.xml
index dac0c093d..5d05cad2f 100644
--- a/libreplan-business/pom.xml
+++ b/libreplan-business/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.libreplan</groupId>
         <artifactId>libreplan</artifactId>
-        <version>1.4.1</version>
+        <version>1.6.0</version>
     </parent>
     <artifactId>libreplan-business</artifactId>
     <packaging>jar</packaging>
diff --git a/libreplan-webapp/pom.xml b/libreplan-webapp/pom.xml
index 849d8497d..83484a27f 100644
--- a/libreplan-webapp/pom.xml
+++ b/libreplan-webapp/pom.xml
@@ -1,10 +1,11 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.libreplan</groupId>
         <artifactId>libreplan</artifactId>
-        <version>1.4.1</version>
+        <version>1.6.0</version>
     </parent>
     <artifactId>libreplan-webapp</artifactId>
     <packaging>war</packaging>
@@ -440,7 +441,7 @@
 
         <dependency>
             <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
+            <artifactId>javax.servlet-api</artifactId>
         </dependency>
 
         <!-- Java mail -->
@@ -465,7 +466,7 @@
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxrs</artifactId>
         </dependency>
-         <dependency>
+        <dependency>
             <groupId>org.codehaus.jackson</groupId>
             <artifactId>jackson-jaxrs</artifactId>
         </dependency>
diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/common/TemplateController.java b/libreplan-webapp/src/main/java/org/libreplan/web/common/TemplateController.java
index 67cae5955..86e076ebb 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/common/TemplateController.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/common/TemplateController.java
@@ -82,48 +82,43 @@ public class TemplateController extends GenericForwardComposer {
         return scenarioManager.getCurrent();
     }
 
-    public void changeScenario() throws SuspendNotAllowedException,
-            InterruptedException {
+    public void changeScenario() throws SuspendNotAllowedException, InterruptedException {
         window.doModal();
     }
 
     public List<Scenario> getScenarios() {
-        if (templateModel == null) {
+        if ( templateModel == null ) {
             return Collections.emptyList();
         }
+
         return templateModel.getScenarios();
     }
 
     public String getCompanyLogoURL() {
-        if (templateModel == null || templateModel.getCompanyLogoURL() == null) {
+        if ( templateModel == null || templateModel.getCompanyLogoURL() == null ) {
             return "";
         }
+
         return templateModel.getCompanyLogoURL().trim();
     }
 
     public void accept() {
-        BandboxSearch scenarioBandboxSearch = (BandboxSearch) window
-                .getFellow("scenarioBandboxSearch");
-        Scenario scenario = (Scenario) scenarioBandboxSearch
-                .getSelectedElement();
+        BandboxSearch scenarioBandboxSearch = (BandboxSearch) window.getFellow("scenarioBandboxSearch");
+        Scenario scenario = (Scenario) scenarioBandboxSearch.getSelectedElement();
 
-        templateModel.setScenario(SecurityUtils.getSessionUserLoginName(),
-                scenario, new IOnFinished() {
-                    @Override
-                    public void onWithoutErrorFinish() {
-                        window.setVisible(false);
-                        Executions.sendRedirect("/");
-                    }
+        templateModel.setScenario(SecurityUtils.getSessionUserLoginName(), scenario, new IOnFinished() {
+            @Override
+            public void onWithoutErrorFinish() {
+                window.setVisible(false);
+                Executions.sendRedirect("/");
+            }
 
-                    @Override
-                    public void errorHappened(Exception exceptionHappened) {
-                        LOG.error("error doing reassignation",
-                                exceptionHappened);
-                        windowMessages.showMessage(Level.ERROR, _(
-                                "error doing reassignment: {0}",
-                                exceptionHappened));
-                    }
-                });
+            @Override
+            public void errorHappened(Exception exceptionHappened) {
+                LOG.error("error doing reassignation", exceptionHappened);
+                windowMessages.showMessage(Level.ERROR, _("error doing reassignment: {0}", exceptionHappened));
+            }
+        });
     }
 
     public void cancel() {
@@ -166,10 +161,8 @@ public class TemplateController extends GenericForwardComposer {
         return notChangedPasswordWarningDisplayPropertyFor(PredefinedUsers.REPORTS);
     }
 
-    private String notChangedPasswordWarningDisplayPropertyFor(
-            PredefinedUsers mandatoryUser) {
-        return asDisplayProperty(templateModel
-                .hasChangedDefaultPassword(mandatoryUser));
+    private String notChangedPasswordWarningDisplayPropertyFor(PredefinedUsers mandatoryUser) {
+        return asDisplayProperty(templateModel.hasChangedDefaultPassword(mandatoryUser));
     }
 
 
@@ -178,8 +171,7 @@ public class TemplateController extends GenericForwardComposer {
     }
 
     public String getDefaultPasswdVisible() {
-        return asDisplayProperty(!templateModel
-                .adminPasswordChangedAndSomeOtherNotChanged());
+        return asDisplayProperty(!templateModel.adminPasswordChangedAndSomeOtherNotChanged());
     }
 
     public String getIdAdminUser() {
@@ -195,8 +187,7 @@ public class TemplateController extends GenericForwardComposer {
     }
 
     public String getIdWssubcontractingUser() {
-        return templateModel.getIdUser(PredefinedUsers.WSSUBCONTRACTING
-                .getLoginName());
+        return templateModel.getIdUser(PredefinedUsers.WSSUBCONTRACTING.getLoginName());
     }
 
     public String getIdManagerUser() {
@@ -208,8 +199,7 @@ public class TemplateController extends GenericForwardComposer {
     }
 
     public String getIdOutsourcingUser() {
-        return templateModel
-                .getIdUser(PredefinedUsers.OUTSOURCING.getLoginName());
+        return templateModel.getIdUser(PredefinedUsers.OUTSOURCING.getLoginName());
     }
 
     public String getIdReportsUser() {
@@ -222,6 +212,7 @@ public class TemplateController extends GenericForwardComposer {
 
     public boolean isNewVersionAvailable() {
         if ( templateModel.isCheckNewVersionEnabled() ) {
+
             if ( VersionInformation.isNewVersionAvailable() ){
                 lastVersionNumber = VersionInformation.getLastVersion();
                 return true;
@@ -233,10 +224,8 @@ public class TemplateController extends GenericForwardComposer {
 
     public String getUsername() {
         CustomUser user = SecurityUtils.getLoggedUser();
-        if (user == null) {
-            return "";
-        }
-        return user.getUsername();
+
+        return (user == null) ? "" : user.getUsername();
     }
 
     public String getVersionMessage(){
diff --git a/pom.xml b/pom.xml
index 132ca8f15..70c506212 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
     <groupId>org.libreplan</groupId>
     <artifactId>libreplan</artifactId>
     <packaging>pom</packaging>
-    <version>1.4.1</version>
+    <version>1.6.0</version>
     <name>LibrePlan</name>
 
     <!--
@@ -504,8 +504,8 @@
             </dependency>
             <dependency>
                 <groupId>javax.servlet</groupId>
-                <artifactId>servlet-api</artifactId>
-                <version>2.5</version>
+                <artifactId>javax.servlet-api</artifactId>
+                <version>3.1.0</version>
                 <type>jar</type>
                 <scope>provided</scope>
             </dependency>