Tweaks I forgot to commit :|
Merge remote-tracking branch 'upstream/master'

Conflicts:
	classes/Characters/GrayPrime.as
	includes/anno.as