doc refactoring
Merge branch 'master' of github.com:SiteSupra/sitesupra-docs

Conflicts:
	.gitignore
	_build/doctrees/environment.pickle
	_build/doctrees/index.doctree
	_build/html/_sources/index.txt
	_build/html/genindex.html
	_build/html/index.html
	_build/html/searchindex.js
	index.rst