Merge branch 'master' into gh-pages
Add meta
Add HandheldFriendly
Merge branch 'gh-pages'