Academy Update

Fixes some broken wiring
Adds some of the new wizard items and some other misc items around.
Fixes the 10,000,000 health windows

what the hell
Merge pull request #5062 from Cheridan/academy

Academy Update