Corrigiendo detalles.
Merge branch 'docker' of github.com:LuisAlejandro/tribus into docker

Conflicts:
	tribus/common/fabric/docker.py
	tribus/data/scripts/tribus-base-image.sh
Merge branch 'docker' of github.com:LuisAlejandro/tribus into docker
Creando comandos de Django para las actividades de mantenimiento de Tribus.