fix screen transitions
Merge branch 'master' of https://github.com/MitulP91/revenge-the-revenge into m-development