0.2.46.0 Mejora en Mis Promos si es que no hay promo alguna.
Merge branch 'master2' of https://github.com/redaumore/promociones into master2

Conflicts:
	application/views/scripts/promotion/index.phtml