Merge branch 'master' into dev
Remove animation on small screens
Merge branch 'dev'