cambio de la estructura y secuencia
Merge branch 'master' of https://github.com/diegobechi/sige-utn

Conflicts:
	application/controllers/docente.php
	application/models/teacher_model.php
	application/views/docente/info_asignaturas.php
	application/views/docente/info_curso.php
	application/views/docente/listados.php
	js/script.js