Le chanto un "al"
Merge branch 'master' into US490

Conflicts:
	index.phpd
Le pongo, una vez mas el "al"
Merge branch 'US490'

Conflicts:
	index.php