Merge branch 'master' into gh-pages
layout, detail fixes
Merge branch 'gh-pages'