Merge branch 'master' into gh-pages
bug fixes for mobile
Merge branch 'gh-pages'