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