Cambio de ganadores de petro-7 a seven eleven
Deshabilitar El Sótano en small merchants
Mejoras
Merge branch 'develop' of https://github.com/OgilvyMX/pacman into develop Slider ing sin logo commercial mexicans

Conflicts:
	merchants.xml