validacion

git me obligo a hacer este cambio
Merge remote-tracking branch 'origin/master'

Conflicts:
	application/views/form/a_activofijo.php