documentation update
Merge branch 'gh-pages' of github.com:proycon/colibri-core into gh-pages

Conflicts:
	doc/.doctrees/environment.pickle
	doc/.doctrees/index.doctree
	doc/_sources/index.txt
	doc/genindex.html
	doc/index.html
	doc/objects.inv
	doc/searchindex.js