Slider listo and twitter icon
Merge branch 'master' of https://github.com/Reston/activa24Duranjo

Conflicts:
	activa24Duranjo/apps/productos/models.py