Tablero Mir Ok
Merge branch 'master' of https://github.com/vagio/sed

Conflicts:
	contenido/Graficas/catalogos/catalogosTableros.php