fix ThermalAnalyzer::adaptPowerMaps, fix power-down scaling calculation
Merge branch 'master' into GMT_2D_Convolution

fix power-down scaling, calculation does now not affect power values as long as scaling
factor is fixed to 1.0 (which is the case by definition according to the octave script);
thus the calculations does not need to be commented out anymore

Conflicts:
	src/ThermalAnalyzer.cpp