Nuevas y old promos 7-eleven, Petro-7
Ajuste total BBB
Merge branch 'release/2.5' into develop

Conflicts:
	home-body.html
	img/promociones_promo_petro_seven_old_thumb.png
	img/promociones_promo_seven_eleven_old_thumb.png
	js/main.js
	promociones_legales.html