Make pre match powers consistent with live powers.
Merge branch 'master' into Jason
Number label now shows according to power trigger key if the power is an active.