Javascript fix for phones
Merge branch 'master' into gh-pages

Javascript fix for phones