think i fixed iPad and android problems
Merge branch 'master' into gh-pages