Refactorizando código de canaima-semilla en Tribus.
Merge branch 'development' of github.com:HuntingBears/tribus into development

Conflicts:
	tribus/common/config.py
	tribus/common/utils.py