bla.
Merge remote-tracking branch 'origin/master'

Conflicts:
	configuracion/consultarCursos.php
	js/configuracion.js
Merge branch 'master' of https://github.com/ewolves/cenfotec-proyecto-1