Merge branch 'Beta-1.0' into Idar
Merge branch 'Beta-1.0' into Idar
Avance Formulario

Se re ordenan la mayoría de los formularios para que quede de buena
manera, pensado en los tamaños sm-md-lg.
Layout avance
Merge branch 'Juan' into Beta-1.0

Conflicts:
	css/lgg.css
layout avance
Avance Layouttt
Merge branch 'Juan' into Beta-1.0
avance avance
Merge branch 'Idar' into Beta-1.0

Conflicts:
	css/lgg.css
Merge Formularios
Merge remote-tracking branch 'origin/Beta-1.0' into Gabriela