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

Conflicts:
	inc/cnxbds.php