Fixed parallax on ipad
Merge branch 'dev' into beta