BS3 #5
Merge branch 'master' of https://github.com/IESMonterroso/intranet

Conflicts:
	xml/jefe/almafaltas.php
	xml/jefe/asignaturas.php
	xml/jefe/exportarHorariosSeneca.php
	xml/jefe/prueba_horarios_seneca.php