Solucionando problema con eventos del alumno (MASTER)
Añadiendo flag MASTER
Merge branch 'hotfix/1'
Merge branch 'master' into feature/3

Conflicts:
	GitAlumno.h