Merge the two Sphinx projects together.
Merge branch 'merge_docs'

Conflicts:
	docs/tech-reference/conf.py