Se agrega listado oculto
Merge branch 'master' of github.com:hsarmiento/asphalt_heat_monitor

Conflicts:
	application/controllers/resume.php