Merge from mbonvini to districtsLoad

This merge gets the new electrical component models.