Alteracao de Nota Fiscal
Merge branch 'master' of github.com:fabiomigliorini/MGsis

Conflicts:
	protected/models/NotaFiscal.php