Curso Superior v2
Merge remote-tracking branch 'origin/master'

Conflicts:
	modulos/horarios/horarios1.php
	modulos/horarios/horarios12.php
	modulos/horarios/horarios2.php