Actualizaciones...
Cambios efectuados...
Merge branch 'master' of https://github.com/victorjo/santander_Maqueta_final

Conflicts:
	widgets/max/w_17/index.html
Merge branch 'master' of https://github.com/victorjo/santander_Maqueta_final