Fixed documentation conf.py with appropriate paths
Merge remote-tracking branch 'origin/master'

Conflicts:
	doc/build/doctrees/architecture.doctree
	doc/build/html/architecture.html
	doc/build/html/index.html
	doc/build/html/objects.inv
	doc/build/html/searchindex.js