commit prj_ope 20130326

possibilidade de trocar senha via sistema e obrigatoriedade do usuario
estar logado para poder mexer no sistema
commit prj_ope 20130327

correções
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
commit prj_ope 20130411

correções Iso-8859-1 -> UTF8
Merge remote-tracking branch 'origin/master' into Humberto

Conflicts:
	application/config/config.php
	application/config/database.php
	application/models/instrutor_model.php
	application/views/instrutores/imprimirFederado.php
	application/views/instrutores/incluirFederado.php
	nbproject/private/private.properties
	nbproject/project.properties
commit prj_ope 20130415
commit prj_ope 20130419
commit 20130419 2
ignore
correção
atualiz
chmod
Merge remote-tracking branch 'origin/Humberto' into Felipe

Conflicts:
	application/config/database.php
	application/controllers/administrador.php
	application/models/instrutor_model.php
	application/views/administrador/incluirFederado.php
	application/views/administrador/manterFederados.php
	application/views/header.php
	application/views/instrutores/incluirFederado.php
	assets/js/historico.js
	assets/js/manterFederados.js