globalUpdate
Merge remote-tracking branch 'origin/master'

Conflicts:
	Presentacion/muestraCurso.php
	Presentacion/nuevoCurso.php
	assets/js/validar.js
	assets/php/psl-config.php
merge conflict
merge conflict 2
Merge remote-tracking branch 'origin/master'

Conflicts:
	Presentacion/muestraCurso.php
	Presentacion/nuevoCurso.php
	assets/js/validar.js
	assets/php/psl-config.php