diff --git a/ganttzk-demo-webapp/src/main/webapp/common/event_error.zul b/ganttzk-demo-webapp/src/main/webapp/common/event_error.zul
index 2e9b46a5f..995e926c5 100644
--- a/ganttzk-demo-webapp/src/main/webapp/common/event_error.zul
+++ b/ganttzk-demo-webapp/src/main/webapp/common/event_error.zul
@@ -1,14 +1,14 @@
 <window title="Erro ${requestScope['javax.servlet.error.status_code']}"
-	width="400px" border="normal" mode="modal"
-	apply="org.navalplanner.web.error.PageForErrorOnEvent">
-	<vbox>
-		Prodúxose un erro na execución:
-		"${requestScope['javax.servlet.error.message']}". O erro
-		gardouse e procurarase arreglalo no menor tempo posible.
-		<hbox style="margin-left:auto; margin-right:auto">
-			<button id="continueWorking" label="Continue" />
-			<button id="reload" label="Reload" />
-			<button id="quitSession" label="Exit Session"></button>
-		</hbox>
-	</vbox>
+    width="400px" border="normal" mode="modal"
+    apply="org.navalplanner.web.error.PageForErrorOnEvent">
+    <vbox>
+        Prodúxose un erro na execución:
+        "${requestScope['javax.servlet.error.message']}". O erro
+        gardouse e procurarase arreglalo no menor tempo posible.
+        <hbox style="margin-left:auto; margin-right:auto">
+            <button id="continueWorking" label="Continue" />
+            <button id="reload" label="Reload" />
+            <button id="quitSession" label="Exit Session"></button>
+        </hbox>
+    </vbox>
 </window>
diff --git a/navalplanner-webapp/src/main/webapp/common/event_error.zul b/navalplanner-webapp/src/main/webapp/common/event_error.zul
index 2e9b46a5f..995e926c5 100644
--- a/navalplanner-webapp/src/main/webapp/common/event_error.zul
+++ b/navalplanner-webapp/src/main/webapp/common/event_error.zul
@@ -1,14 +1,14 @@
 <window title="Erro ${requestScope['javax.servlet.error.status_code']}"
-	width="400px" border="normal" mode="modal"
-	apply="org.navalplanner.web.error.PageForErrorOnEvent">
-	<vbox>
-		Prodúxose un erro na execución:
-		"${requestScope['javax.servlet.error.message']}". O erro
-		gardouse e procurarase arreglalo no menor tempo posible.
-		<hbox style="margin-left:auto; margin-right:auto">
-			<button id="continueWorking" label="Continue" />
-			<button id="reload" label="Reload" />
-			<button id="quitSession" label="Exit Session"></button>
-		</hbox>
-	</vbox>
+    width="400px" border="normal" mode="modal"
+    apply="org.navalplanner.web.error.PageForErrorOnEvent">
+    <vbox>
+        Prodúxose un erro na execución:
+        "${requestScope['javax.servlet.error.message']}". O erro
+        gardouse e procurarase arreglalo no menor tempo posible.
+        <hbox style="margin-left:auto; margin-right:auto">
+            <button id="continueWorking" label="Continue" />
+            <button id="reload" label="Reload" />
+            <button id="quitSession" label="Exit Session"></button>
+        </hbox>
+    </vbox>
 </window>
diff --git a/navalplanner-webapp/src/main/webapp/common/layout/_customMenu.zul b/navalplanner-webapp/src/main/webapp/common/layout/_customMenu.zul
index 65fc19af8..530144356 100644
--- a/navalplanner-webapp/src/main/webapp/common/layout/_customMenu.zul
+++ b/navalplanner-webapp/src/main/webapp/common/layout/_customMenu.zul
@@ -1,29 +1,29 @@
 <div id="menuContainer" xmlns:n="http://www.zkoss.org/2005/zk/native"
-	use="org.navalplanner.web.common.CustomMenuController">
-	<n:table border="0" cellspacing="0" cellpadding="0">
-		<n:tr>
-			<n:td forEach="${menuContainer.customMenuItems}">
-				<n:a href="${each.url}" class=
-					"menuup${(each.activeParent?'_activa':'')}">${c:l(each.name)}</n:a>
-			</n:td>
-		</n:tr>
-	</n:table>
-	<n:table width="100%" height="30" border="0" cellpadding="0"
-		cellspacing="0">
-		<n:tr>
-			<n:td bgcolor="#2A83B4">
-				<n:table border="0" cellspacing="0" cellpadding="0">
-					<n:tr>
-						<n:td width="10" />
-						<n:td forEach="${menuContainer.customMenuSecondaryItems}">
-							<n:a href="${each.url}" class="sub_menu">${c:l(each.name)}</n:a>
-							<n:td width="14"
-								background="/navalplanner-webapp/common/img/sub_separacion.gif" />
-						</n:td>
-					</n:tr>
-				</n:table>
+    use="org.navalplanner.web.common.CustomMenuController">
+    <n:table border="0" cellspacing="0" cellpadding="0">
+        <n:tr>
+            <n:td forEach="${menuContainer.customMenuItems}">
+                <n:a href="${each.url}" class=
+                    "menuup${(each.activeParent?'_activa':'')}">${c:l(each.name)}</n:a>
+            </n:td>
+        </n:tr>
+    </n:table>
+    <n:table width="100%" height="30" border="0" cellpadding="0"
+        cellspacing="0">
+        <n:tr>
+            <n:td bgcolor="#2A83B4">
+                <n:table border="0" cellspacing="0" cellpadding="0">
+                    <n:tr>
+                        <n:td width="10" />
+                        <n:td forEach="${menuContainer.customMenuSecondaryItems}">
+                            <n:a href="${each.url}" class="sub_menu">${c:l(each.name)}</n:a>
+                            <n:td width="14"
+                                background="/navalplanner-webapp/common/img/sub_separacion.gif" />
+                        </n:td>
+                    </n:tr>
+                </n:table>
 
-			</n:td>
-		</n:tr>
-	</n:table>
+            </n:td>
+        </n:tr>
+    </n:table>
 </div>
\ No newline at end of file
diff --git a/navalplanner-webapp/src/main/webapp/common/layout/template.zul b/navalplanner-webapp/src/main/webapp/common/layout/template.zul
index effbba174..4f8afaa05 100644
--- a/navalplanner-webapp/src/main/webapp/common/layout/template.zul
+++ b/navalplanner-webapp/src/main/webapp/common/layout/template.zul
@@ -15,8 +15,8 @@
                         onClick="alert(self.label)" />
                     <menuitem label="${c:l('mainmenu.plannifications_list')}"
                         onClick="alert(self.label)" />
-    			</menupopup>
-    		</menu>
+                </menupopup>
+            </menu>
 
             <menu label="${c:l('mainmenu.resources')}">
                 <menupopup>
@@ -57,16 +57,16 @@
             </menu>
 
             <menu label="${c:l('mainmenu.help')}">
-    			<menupopup>
-    				<menu label="${c:l('mainmenu.about')}">
-    					<menupopup>
-        					<menuitem label="${c:l('mainmenu.aclunaga')}"
+                <menupopup>
+                    <menu label="${c:l('mainmenu.about')}">
+                        <menupopup>
+                            <menuitem label="${c:l('mainmenu.aclunaga')}"
                                 href='/common/aclunaga.zul' />
-    					</menupopup>
-    				</menu>
-    			</menupopup>
-    		</menu>
-    	</menubar>
+                        </menupopup>
+                    </menu>
+                </menupopup>
+            </menu>
+        </menubar>
 
     <div self="@{insert(content)}"/>
 
diff --git a/navalplanner-webapp/src/main/webapp/planner/order.zul b/navalplanner-webapp/src/main/webapp/planner/order.zul
index c11a84f46..3550d7344 100644
--- a/navalplanner-webapp/src/main/webapp/planner/order.zul
+++ b/navalplanner-webapp/src/main/webapp/planner/order.zul
@@ -8,10 +8,10 @@
 <?link rel="stylesheet" type="text/css" href="/common/css/navalpro_zk.css"?>
 <zk>
 
-	<zscript><![CDATA[
-		planningController = orderPlanningController;
-		allocationController = planningController.resourceAllocationController;
-		splittingTaskController = planningController.splittingController;
+    <zscript><![CDATA[
+        planningController = orderPlanningController;
+        allocationController = planningController.resourceAllocationController;
+        splittingTaskController = planningController.splittingController;
     ]]>
     </zscript>
 
diff --git a/navalplanner-webapp/src/main/webapp/resources/worker/_editWorkRelationship.zul b/navalplanner-webapp/src/main/webapp/resources/worker/_editWorkRelationship.zul
index 276405568..38ec7c0ac 100644
--- a/navalplanner-webapp/src/main/webapp/resources/worker/_editWorkRelationship.zul
+++ b/navalplanner-webapp/src/main/webapp/resources/worker/_editWorkRelationship.zul
@@ -1,15 +1,15 @@
 <window id="${arg.top_id}" title="${arg.title}">
     <grid id="edit">
-		<columns>
-			<column label="Date start"/>
-			<column label="Date end"/>
-			<column label="Relationship"/>
-		</columns>
+        <columns>
+            <column label="Date start"/>
+            <column label="Date end"/>
+            <column label="Relationship"/>
+        </columns>
         <rows>
-			<row>
-				<datebox id="editWorkRelationshipStartDate" width="180px"
+            <row>
+                <datebox id="editWorkRelationshipStartDate" width="180px"
                     value="@{workRelationship.editRelationship.startDate}" />
-				<datebox id="editWorkRelationshipEndDate" width="180px"
+                <datebox id="editWorkRelationshipEndDate" width="180px"
                     value="@{workRelationship.editRelationship.endDate}" />
                 <listbox onSelect="" mold="select" rows="1" id="selectedWorkCriterion"
                     model="@{workRelationship.workCriterions}" disabled="@{! workRelationship.editing}">
@@ -17,8 +17,8 @@
                             label="@{workCriterion.name}"
                             value="@{workCriterion}" />
                 </listbox>
-			</row>
-		</rows>
+            </row>
+        </rows>
       </grid>
     <button onClick="workRelationship.saveCriterionSatisfaction();"
         label="Save Work Relationship" />
diff --git a/navalplanner-webapp/src/main/webapp/resources/worker/_list.zul b/navalplanner-webapp/src/main/webapp/resources/worker/_list.zul
index f34509f3e..3d2d36e66 100644
--- a/navalplanner-webapp/src/main/webapp/resources/worker/_list.zul
+++ b/navalplanner-webapp/src/main/webapp/resources/worker/_list.zul
@@ -1,28 +1,28 @@
 <window id="${arg.top_id}" title="List">
-	<grid id="listing" model="@{controller.workers}" mold="paging"
-		pageSize="5">
-		<columns>
-			<column label="First Name" sort="auto(firstName)" />
-			<column label="Surname" sort="auto(surname)" />
-			<column label="nif" sort="auto(nif)" />
-			<column label="daily_hours" sort="auto(dailyHours)" />
-			<column label="operations" />
-		</columns>
-		<rows>
-			<row self="@{each='worker'}" value="@{worker}">
-				<label value="@{worker.firstName}" />
-				<label value="@{worker.surname}" />
-				<label value="@{worker.nif}" />
-				<label value="@{worker.dailyHours}" />
-				<hbox>
-					<button label="Edit"
-						onClick="controller.goToEditForm(self.getParent().getParent().value);">
-					</button>
-				</hbox>
-			</row>
-		</rows>
-	</grid>
-	<button id="show_create_form" onClick="controller.goToCreateForm();"
-		label="Create">
-	</button>
+    <grid id="listing" model="@{controller.workers}" mold="paging"
+        pageSize="5">
+        <columns>
+            <column label="First Name" sort="auto(firstName)" />
+            <column label="Surname" sort="auto(surname)" />
+            <column label="nif" sort="auto(nif)" />
+            <column label="daily_hours" sort="auto(dailyHours)" />
+            <column label="operations" />
+        </columns>
+        <rows>
+            <row self="@{each='worker'}" value="@{worker}">
+                <label value="@{worker.firstName}" />
+                <label value="@{worker.surname}" />
+                <label value="@{worker.nif}" />
+                <label value="@{worker.dailyHours}" />
+                <hbox>
+                    <button label="Edit"
+                        onClick="controller.goToEditForm(self.getParent().getParent().value);">
+                    </button>
+                </hbox>
+            </row>
+        </rows>
+    </grid>
+    <button id="show_create_form" onClick="controller.goToCreateForm();"
+        label="Create">
+    </button>
 </window>
\ No newline at end of file
diff --git a/navalplanner-webapp/src/main/webapp/resources/worker/_workRelationships.zul b/navalplanner-webapp/src/main/webapp/resources/worker/_workRelationships.zul
index 5b967acf0..15649bca2 100644
--- a/navalplanner-webapp/src/main/webapp/resources/worker/_workRelationships.zul
+++ b/navalplanner-webapp/src/main/webapp/resources/worker/_workRelationships.zul
@@ -3,31 +3,31 @@
     <grid id="history"
         model="@{controller.workRelationship.criterionSatisfactions}"
         mold="paging" pageSize="5">
-		<columns>
-			<column label="Date start" width="150px"/>
-			<column label="Date end" width="150px"/>
-			<column label="Relationship"/>
-			<column label="Operations"/>
-		</columns>
+        <columns>
+            <column label="Date start" width="150px"/>
+            <column label="Date end" width="150px"/>
+            <column label="Relationship"/>
+            <column label="Operations"/>
+        </columns>
         <rows>
-			<row self="@{each='criterionSatisfaction'}"
+            <row self="@{each='criterionSatisfaction'}"
                 value="@{criterionSatisfaction}">
-				<label id="date_start"
+                <label id="date_start"
                     value="@{criterionSatisfaction.startDate}" width="150px" />
-				<label id="date_end"
+                <label id="date_end"
                     value="@{criterionSatisfaction.endDate}" width="150px" />
-				<label value="@{criterionSatisfaction.criterion.name}" />
-				<hbox>
-					<button label="Editar"
-						onClick="controller.goToEditWorkRelationshipForm(
+                <label value="@{criterionSatisfaction.criterion.name}" />
+                <hbox>
+                    <button label="Editar"
+                        onClick="controller.goToEditWorkRelationshipForm(
                         self.getParent().getParent().value);">
-					</button>
-					<button label="Borrar"
-						onClick="controller.workRelationship.deleteCriterionSatisfaction(self.getParent().getParent().value);">
-					</button>
-				</hbox>
-			</row>
-		</rows>
+                    </button>
+                    <button label="Borrar"
+                        onClick="controller.workRelationship.deleteCriterionSatisfaction(self.getParent().getParent().value);">
+                    </button>
+                </hbox>
+            </row>
+        </rows>
       </grid>
     <button label="New entry"
         onClick="controller.goToAddWorkRelationshipForm()">