Merging changes from master

(Bart's calibration and land abandonment work)

src/ac/ed/lurg/demand/ElasticDemandManager.java

@@ -212,12 +212,12 @@ public class ElasticDemandManager extends AbstractSSPDemandManager {
 
 		Map<WoodCommodityType, Double> woodDemands = new HashMap<>();
 
-		Map<WoodCommodityType, Double> baseExpCpcMap = baseWoodCpcCache.get(country);
 		if (ModelConfig.IS_CALIBRATION_RUN) {  // we should only do this during calibration
 			baseWoodCpcCache.put(country, woodPc);
-			baseExpCpcMap = woodPc;
 		}
 
+		Map<WoodCommodityType, Double> baseExpCpcMap = baseWoodCpcCache.get(country);
+
 		for (Map.Entry<WoodCommodityType, Double> entry : woodPc.entrySet()) {
 			WoodCommodityType commodity = entry.getKey();
 			if (commodity.equals(WoodCommodityType.RESIDUAL))