add rift fading
Merge branch 'master' into rift_fade
more rift fade stuff
Merge pull request #761 from LucidCrux/rift_fade

Rift fade