Add cable coloring
Merge remote-tracking branch 'origin/master'

Conflicts:

	simElectricity/src/main/java/simElectricity/API/EnergyTile/IConductor.java