commit prj_ope 20130322

parte do login feita
necessário testá-la
lancamento de notas
Merge remote-tracking branch 'origin/Humberto' into Felipe

Conflicts:
	application/config/config.php
	application/views/header.php
	banco/federacaoHumberto.sql
autalização com logimn
Visualizar participantes por evento dump do novo banco
Merge remote-tracking branch 'origin/Felipe' into Felipe
atualização
Merge remote-tracking branch 'origin/Felipe' into marcos

Conflicts:
	application/views/instrutores/alterarFederado.php
	application/views/instrutores/imprimirFederado.php
	application/views/instrutores/sucessoAlteracaoFederado.php
atualização marcos
git ignore
ignore
Merge remote-tracking branch 'origin/marcos'

Conflicts:
	.gitignore
	.htaccess
	application/config/config.php
	application/config/database.php
	application/controllers/administrador.php
	application/controllers/alunos.php
	application/controllers/coordenador.php
	application/controllers/home.php
	application/controllers/instrutores.php
	application/controllers/login.php
	application/libraries/funcoes.php
	application/models/coordenador_model.php
	application/models/instrutor_model.php
	application/models/login_model.php
	application/views/coordenador/editar.php
	application/views/coordenador/listaEventos.php
	application/views/header.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
	application/views/login.php