Merge origin/master

Conflicts:
	web/leccion.xhtml
Merge origin/master

Conflicts:
	src/java/conexion/Conexion.java
	src/java/modelos/Nota.java
	web/profesor.xhtml