Arreglar formulario atributos
Merge branch 'base' into marcen
Merge branch 'marcen'