Merge branch 'master' into gh-pages
I
Smartphone optimization
Moved text-size-adjust to *
Rollback * text-size-adjust
Fixed view on small screens
Merge remote-tracking branch 'origin/gh-pages' into gh-pages

Conflicts: index.html
Fixed after merge with gh-pages