Merge branch 'master' into design-alt
nuevo layout vertical
Merge branch 'design-alt'