Merge branch 'gh-pages'

Conflicts:
	_assets/glossary.doc
	index.html