Merge branch 'markup'
Merge branch 'markup'
Merge branch 'master' into markup
Merge branch 'markup'
Page: Menu Ocasion Final
Page :: Mis Colecciones
Page :: Mis Colecciones Final
Page :: Mis Colecciones Detalle
Merge branch 'markup'

Conflicts:
	markup-ensuMesa/includes/js/functions.js
	markup-ensuMesa/includes/layout.css
Merge branch 'master' into markup