pestaña incendio terminada
Merge branch 'CONANP' of https://github.com/tereom/cliente_web2py into CONANP

Conflicts:
	views/13_impactos_ambientales/index3.html