changed rotate pause
Merge branch 'dev'