Merge branch 'master' into gh-pages
Media Queries additional edits
Merge branch 'gh-pages'