Merge branch 'forestry'

# Conflicts:
#	GAMS/IntExtOpt.gms
#	data/bioenergy_gen2_iiasa.csv
#	data/craftyCountries.csv
#	data/ssp.csv
#	data/ssp_covid.csv
#	data/tradeBarriers.csv
#	debug_config.properties
#	scripts/compilePlum.sh
#	scripts/createScenarios.sh
#	scripts/createShockFiles.R
#	scripts/runPlum.sh
#	src/ac/ed/lurg/InternationalMarket.java
#	src/ac/ed/lurg/ModelConfig.java
#	src/ac/ed/lurg/ModelMain.java
#	src/ac/ed/lurg/Timestep.java
#	src/ac/ed/lurg/country/AbstractCountryAgent.java
#	src/ac/ed/lurg/country/CompositeCountryManager.java
#	src/ac/ed/lurg/country/CountryAgent.java
#	src/ac/ed/lurg/country/CountryAgentManager.java
#	src/ac/ed/lurg/country/CountryPrice.java
#	src/ac/ed/lurg/country/GlobalPrice.java
#	src/ac/ed/lurg/country/SingleCountry.java
#	src/ac/ed/lurg/country/SubsidyRateManager.java
#	src/ac/ed/lurg/country/TradeConstraint.java
#	src/ac/ed/lurg/country/TradeManager.java
#	src/ac/ed/lurg/country/crafty/CraftyCountryAgent.java
#	src/ac/ed/lurg/country/crafty/CraftyProdManager.java
#	src/ac/ed/lurg/country/gams/GamsCountryInput.java
#	src/ac/ed/lurg/country/gams/GamsDemandOptimiser.java
#	src/ac/ed/lurg/country/gams/GamsLocationOptimiser.java
#	src/ac/ed/lurg/country/gams/GamsRasterOptimiser.java
#	src/ac/ed/lurg/demand/AbstractDemandManager.java
#	src/ac/ed/lurg/demand/AbstractSSPDemandManager.java
#	src/ac/ed/lurg/demand/BaseConsumpManager.java
#	src/ac/ed/lurg/demand/BioenergyDemandManager.java
#	src/ac/ed/lurg/demand/DemandManagerFromFile.java
#	src/ac/ed/lurg/demand/ElasticDemandManager.java
#	src/ac/ed/lurg/demand/PriceMarkUps.java
#	src/ac/ed/lurg/landuse/CropUsageData.java
#	src/ac/ed/lurg/landuse/LandUseItem.java