Update documentation
Merge branch 'gh-pages'

Conflicts:
	tags.html