template estudiate,docentes
Merge remote-tracking branch 'origin/master'
prueva arel
Merge remote-tracking branch 'origin/master'

Conflicts:
	_inc/clases/Tribunal.php