Merge branch 'controllers' into vistas

Conflicts:
	application/views/anuncios.jade
Completa eliminacion de anuncios
Merge branch 'controllers' into vistas
Completa visualizacion por promocion
Merge branch 'vistas' into controllers
Actualiza package.json
Agrega prototipo chat
Agrega prototipo chat
Merge branch 'vistas' into controllers
Funciona el chat