0.2.51.0 - Internet Explorer no sorpotado.
Merge branch 'master2' of https://github.com/redaumore/promociones into master2

Conflicts:
	application/views/scripts/promotion/index.phtml
	public/skins/default/css/pap.css