Merge branch 'vistas' into controllers

Conflicts:
	application/views/anuncios.jade
Merge branch 'controllers' into vistas
Completa visualizacion por promocion