Fixed unit display
Merge branch 'master' of https://github.com/Universal-Electricity/Universal-Electricity

Conflicts:
	src/universalelectricity/core/electricity/ElectricityDisplay.java