Merge branch 'hotfix/1.5.1' into develop
Merge branch 'hotfix/1.6' into develop
arreglos en border color
fake border and bg for ie7 and 8
Merge branch 'hotfix/1.6.1' into develop
Merge branch 'hotfix/1.6.1'
cambios parserxml
cambios para iexcellence
Terminada nueva funcionalidad xml, jalando en todos los navegadores
Merge branch 'feature/newxml' into develop

Conflicts:
	home-body.html
merge and fixes
Merge branch 'release/1.7'