Mejorando esquema de documentación.
Merge branch 'development' of github.com:HuntingBears/tribus into development

Conflicts:
	TODO
	tribus/common/setup/build.py