Udated 2020 and 2023 scenarios

Updates the presets.

NOTE: this preset contains a new technology (number_of_energy_power_engine_network_gas) which exists on beta but not on LIVE. 
The client would like to have this scenario on the LIVE server anyway. @antw is this a problem?