Merge origin/master

Conflicts:
	contenido/Arboles/js/funciones_arboles.js
Merge origin/master

Conflicts:
	inc/cnxbds.php