again smarter reporter update (prolly...)
reinserting energy lost from hdr clamp
Merge branch 'master' into fast

Conflicts:
	src/sbf/RandomParameterFilter.cpp