Ultimos Ajustes Reportes
Merge branch 'master' of https://github.com/jcabral02/sis_nom

Conflicts:
	app/routes.php