Merge remote-tracking branch 'origin/master' into marcos
remoção
atualizações de sabado dia 30/03/2013
Merge remote-tracking branch 'origin/master' into marcos

Conflicts:
	application/config/config.php
	application/config/database.php
	application/controllers/administrador.php
	application/controllers/coordenador.php
	application/controllers/login.php
	application/language/pt-br/form_validation_lang.php
	application/models/administrador_model.php
	application/models/coordenador_model.php
	application/models/login_model.php
	application/views/administrador/alterarFederado.php
	application/views/administrador/alterarFilial.php
	application/views/administrador/alterarPedido.php
	application/views/administrador/enviarNotificacoes.php
	application/views/administrador/historico.php
	application/views/administrador/imprimirFederado.php
	application/views/administrador/imprimirFilial.php
	application/views/administrador/incluirFederado.php
	application/views/administrador/incluirFilial.php
	application/views/administrador/malaDireta.php
	application/views/administrador/manterFederados.php
	application/views/administrador/manterFiliais.php
	application/views/administrador/notificacoes.php
	application/views/administrador/novaMensagem.php
	application/views/administrador/pedidos.php
	application/views/administrador/sucessoAlteracaoFederado.php
	application/views/administrador/sucessoAlteracaoFilial.php
	application/views/administrador/sucessoAlterarPedido.php
	application/views/administrador/sucessoInclusaoFederado.php
	application/views/administrador/sucessoInclusaoFilial.php
	application/views/alunos/notas.php
	application/views/coordenador/criarEvento.php
	application/views/coordenador/editar.php
	application/views/coordenador/index.php
	application/views/coordenador/listaEventos.php
	application/views/coordenador/modalidade.php
	application/views/coordenador/participantes.php
	application/views/coordenador/professores_modalidade.php
	application/views/footer.php
	application/views/header.php
	application/views/index.php
	application/views/login.php
	assets/js/historico.js
	assets/js/manterFederados.js
	assets/js/manterFilial.js
	system/language/pt-br/calendar_lang.php
	system/language/pt-br/date_lang.php
	system/language/pt-br/db_lang.php
	system/language/pt-br/email_lang.php
	system/language/pt-br/form_validation_lang.php
	system/language/pt-br/ftp_lang.php
	system/language/pt-br/imglib_lang.php
	system/language/pt-br/profiler_lang.php
	system/language/pt-br/upload_lang.php
Merge remote-tracking branch 'origin/master' into marcos

Conflicts:
	application/views/coordenador/prontuario.php
Merge remote-tracking branch 'origin/master' into marcos

Conflicts:
	application/views/coordenador/confirmacao.php
	assets/css/instrutor.css
	assets/js/increverFederado.js
	banco/squema_do_banco.sql
dump
Merge remote-tracking branch 'origin/marcos'