Iniciando API de Deploy.
Agregando algunos métodos para el Charm Deploy.
Siguiendo con el desarrollo de la API del Charm Deploy.
Agregando ignores.
Merge branch 'development' into charms

Conflicts:
	tribus/config/web.py
	tribus/web/api/resources.py
Merge branch 'charms' of github.com:CanaimaGNULinux/tribus into charms

Conflicts:
	tribus/common/fabric/local.py
templates de charms
Merge branch 'development' into charms-graphic
Merge branch 'development' of github.com:tribusdev/tribus into charms

Conflicts:
	.gitignore
	tribus/web/api/__init__.py
	tribus/web/api/resources.py
Agregando angular.draganddrop
Ordenando code del controller.angular
- Creando comandos para configuracion de maquinas remotas.
construyendo interfaz de charms
Merge branch 'development' into charms-graphic
Merge branch 'charms' into charms-graphic

Conflicts:
	tribus/data/scripts/django-runserver.sh
	tribus/data/scripts/django-syncdb.sh
	tribus/data/scripts/tribus-base-image.sh
Modificando tipo de dato en el recurso CharmList
Creando servicio para consultar la api charms
Modificando templates charms
Agregando servicio para leer MetaData
Agregando Controlador para obtener meta Data
Agregando dependencias
Actualizando Templates
Merge branch 'development' into charms

Conflicts:
	tribus/data/scripts/django-runserver.sh
	tribus/data/scripts/django-syncdb.sh
	tribus/data/scripts/tribus-base-image.sh
Merge branch 'development' into charms-graphic

Conflicts:
	tribus/data/scripts/django-runserver.sh
Modificando templates charms