atualização
Merge remote-tracking branch 'origin/Felipe' into Felipe
remover tudo
asd
Merge remote-tracking branch 'origin/master' into Felipe

Conflicts:
	application/config/config.php
	application/controllers/alunos.php
	application/controllers/instrutores.php
	application/models/instrutor_model.php
	application/views/instrutores/alterarFederado.php
	application/views/instrutores/cadastro.php
	application/views/instrutores/imprimirFederado.php
	application/views/instrutores/incluirFederado.php
	application/views/instrutores/inscricao.php
	application/views/instrutores/manutencao.php
	application/views/instrutores/novoaluno.php
	application/views/instrutores/sucessoAlteracaoFederado.php
face
remoção
commit
remoção geral
atualiza
config
Controllers
core
tela de erros
helpers
hook
idioma
alng
views
datamapper