merit_demand_fix

Correction to the computation of the total demand which is sent to the Merit module. 

This fixes https://github.com/quintel/merit/issues/120