Update documentation
jjMerge branch 'gh-pages'

Conflicts:
	index.html
Merge branch 'master' into gh-pages
Update documentation