Merge branch 'gh-pages'
turn off text size adjust for iphone
Merge branch 'master' into gh-pages