Merge remote-tracking branch 'origin/1.7.2-MNA' into 1.7.2-test

Conflicts:
	assets/eln/model/EnergyMeter/EnergyMeter.blend
	assets/eln/model/EnergyMeter/EnergyMeter.obj
	assets/eln/model/EnergyMeter/EnergyMeter.png
	assets/eln/model/EnergyMeter/EnergyMeter.xcf
	mods/eln/Eln.java
	mods/eln/misc/Version.java
	mods/eln/sixnode/energymeter/EnergyMeterDescriptor.java
	mods/eln/sixnode/energymeter/EnergyMeterElement.java
	mods/eln/sixnode/energymeter/EnergyMeterGui.java
	mods/eln/sixnode/energymeter/EnergyMeterRender.java