Delete fade, Create transition
Merge branch 'develop'