Update documentation
Merge branch 'gh-pages'

Conflicts:
	archives.html
	authors.html

test