Solar Network Updates
Merge to fix discrepancy between solar network
merge network
energy network merge
Merge branch 'master' of https://github.com/suavecode/SUAVE