cambios lb
Merge remote-tracking branch 'origin/master'

Conflicts:
	sgp/app/templates/indexLineaBase.html