Resolve Conflicts:
        	simElectricity/src/main/java/simElectricity/Common/EnergyNet/EnergyNet.java
Revert "Revert "Merge remote-tracking branch 'origin/master'"
This reverts commit cff8fa2ee1b40787c54cbe5c88949da99d4a1927."