Updated documentation for version 2
Merge branch 'gh-pages-wip-1' into gh-pages