Estilo design

Branches estiloDesign and master merged.