Merge
Add chagnes from master
Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
Change settings file for mobile devices