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
commit
commit prj_ope 20130411

correções Iso-8859-1 -> UTF8
commit

parte de login
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
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
atualizar