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

Conflicts:
	doc/src/index.rst
documentation update