Merge origin/emanuel_josue into emanuel_josue

Conflicts:
	capa_interfaz/js/funciones.js
Merge origin/emanuel_josue into emanuel_josue