Merge origin/master

Conflicts:
	src/java/Controllers/ModuloProfesor/DashboardProfesor.java
	web/Profesor/dashboard.xhtml