This is part of a larger refactoring effort of the remind core.
Here, code related to the social welfare functions has been moved
from the core to the new module. Some renaming was required. For
now, only one module realization exists, 'utilitarian', which
corresponds one to one to what was in the core before. This
refactoring exercises has no effect on the results!

added missing not_used.txt files

*gdx effect* Add scenarios for phase out of trad. biomass for SDP, SS…

documentation of modules 80_optimization and 81_codePerformance

Minor changes (docu)

Merge remindmodel/remind develop into my repo

*refactoring* adjusted not_used.txt files and renamed parameters to f…

*bugfix* adjust gdpPcScen according to gdpScen

restoring older state of some magicc files and of the c_GDPpcScen commit to allow the model to run

Correct the description of incolearn in generisdata_tech.prn, _SSP1, _SSP5 files

Revert "*bugfix* fixed p_GDPpcScen definition and added SDP as scenario. Corrects p_developmentState and the phase-in of MAgPIE CO2 price"

This reverts commit 844132d2.

Correct description of incolearn

Correct description of incolearn

Correct description of incolearn

*bugfix* fixed p_GDPpcScen definition and added SDP as scenario.

removed core/magicc from "files to be copied to output folder" as it …

*bugfix* fixed p_GDPpcScen definition and added SDP as scenario. Corrects p_developmentState and the phase-in of MAgPIE CO2 price

added missing files

*gdx neutral* Follow up to previous commit: replaced hard coded reduc…

*gdx neutral* Follow up to previous commit: replaced hard coded reduction factor for price on CO2-LUC with new parameter defined in default.cfg

*gdx neutral* Docu: added one single word