Creada rama develop.
Creada rama develop.
Creada rama con cambios hechos en producción.
Hotel status linked with hotel
Hotel status linked with hotel
Probando BD en local.
Probando BD en local.
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	socialbits/settings.py
Bug fixed: Staticfiles not served when DEBUG=False
dummy
Solucionados bugs del tratamiento de  errores al obtener info de los tweets.
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	socialbits/settings.py