Arreglar variable cookies
Merge branch 'marcen' into catalogo