Styleguide changes
Merge branch 'refs/heads/visual-guide' into gh-pages