Corregidos errores varios
Merge branch 'franciscoJavier' into develop