Updated with the latest from Huddle.

Conflicts:
	src/main/resources/Alpha content master.xlsx
Modified timeseries multiplier handling to work with values less that 1.