Merge branch 'master' into gh-pages
Changed index2 to index side-wide.

Changed index2 to index side-wide.
Merge branch 'gh-pages'