Pantallas que no salian 1
Merge remote-tracking branch 'origin/master'

Conflicts:
	modulos/aulas/aulas1.php
	modulos/planificacion/ingreso.php
Merge branch 'master' of https://github.com/Idesware/sig