Merged roslyn_branch into default

.classpath

GAMS/IntExtOpt.gms

config.properties

data/3deg/protected_areas.txt

data/trade_barriers_dummy.csv

src/ac/ed/lurg/ModelConfig.java

src/ac/ed/lurg/ModelMain.java

src/ac/ed/lurg/country/CountryAgent.java

src/ac/ed/lurg/country/GlobalPrice.java

src/ac/ed/lurg/country/TradeManager.java

src/ac/ed/lurg/country/gams/GamsCountryInput.java

src/ac/ed/lurg/country/gams/GamsLocationOptimiser.java

src/ac/ed/lurg/country/gams/GamsLocationTest.java

src/ac/ed/lurg/country/gams/GamsRasterOptimiser.java

src/ac/ed/lurg/country/gams/GamsRasterTest.java

src/ac/ed/lurg/landuse/LandCoverItem.java

src/ac/ed/lurg/landuse/LandCoverReader.java

src/ac/ed/lurg/landuse/LandUseItem.java

src/ac/ed/lurg/landuse/ProtectedAreasReader.java

src/ac/ed/lurg/types/CropToDoubleMap.java