Conflicts:
	widgets/min/w_1/index.html
	widgets/min/w_5/index.html
commit ajac loader|
Merge branch 'master' of https://github.com/victorjo/santander_Maqueta_final
commit remove