Merge remote-tracking branch 'origin/Humberto'
atualização
Merge remote-tracking branch 'origin/master' into Felipe

Conflicts:
	application/views/header.php
Merge remote-tracking branch 'origin/Felipe'
deletando projeto
del
ht
atualização master
Merge remote-tracking branch 'origin/Humberto'

Conflicts:
	application/config/config.php
remover nbprojetc
git ignore
removendo arquivos do master
git ignore
Merge remote-tracking branch 'origin/Humberto'

Conflicts:
	.gitignore
	application/controllers/administrador.php
	application/models/administrador_model.php
	application/views/administrador/alterarFederado.php
	application/views/administrador/incluirFederado.php
	application/views/administrador/sucessoAlteracaoFederado.php
	application/views/administrador/sucessoInclusaoFederado.php
remover dados
bootstramp
atualiza
js
js2
lista de eventos