Merge branch 'Beta-1.0' into Juan
Grilla más acabada
Merge branch 'Juan' into Beta-1.0