Fixed merge conflicts
Merge pull request #313 from BU-CS673/Canfield-Staging

Canfield-Staging -> production: Network system updates
Merge branch 'production' into Canfield-Staging-2