Updated documentation
Merge branch 'gh-pages-sass' into gh-pages