add FadeManager toka
Merge branch 'mmd' into room