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

Conflicts:
	application/controllers/administrador.php
	application/controllers/coordenador.php
	application/models/coordenador_model.php
	application/models/instrutor_model.php
	application/views/coordenador/criarEvento.php
	application/views/coordenador/editar.php
	application/views/coordenador/index.php
	application/views/coordenador/lancar_notas_aluno.php
	application/views/coordenador/listaEventos.php
	application/views/coordenador/lista_alunos_avaliacao.php
	application/views/header.php
	assets/js/coordenador.js
	banco/squema_do_banco.sql
inscrever aluno para pré-avaliacao
Merge remote-tracking branch 'origin/master' into Humberto