Merge remote-tracking branch 'origin/Release' into 17-comprobacion-del-logro-recogidas-todas-las-notas
