reporte-editar-bitacoras y varios cambios
Merge branch 'master' of https://github.com/jercc20/WebBuilders

Conflicts:
	SistemaOdontologico/includes/mathias.php