Merge terminado
Merge origin/main into main

Conflicts:
	SchoolServer/nbproject/private/private.properties