Merge branch 'rama3' into 'ramaPostgres'

# Conflicts:
#   src/main/java/es/uva/inf/tfg/ginquin/smellswisdom/controller/LoginResponsiveController.java
#   src/main/webapp/css/template.zul
#   src/main/webapp/login.zul

src/main/webapp/login.zul

 <?taglib uri="http://www.zkoss.org/dsp/web/theme" prefix="t"?>
-<?init class="org.zkoss.zk.ui.util.Composition" arg0="/css/template.zul"?>
+<?taglib uri="/WEB-INF/security.tld" prefix="sec"?>
 <zk>
 	<div apply="es.uva.inf.tfg.ginquin.smellswisdom.controller.LoginResponsiveController">
 		<box id="content" self="@define(content)" orient="horizontal"