Fix types
Merge school changes with one local change

Conflicts:
	src/ACT31.cpp