Merge remote-tracking branch...

Merge remote-tracking branch 'origin/70-fugitive_fossil_fuels-implementation-of-a-new-emission-sector-in-hermesv3_bu'

# Conflicts:
#	hermesv3_bu/sectors/sector.py
3 jobs for master
in 0 seconds, using 0 compute credits, and was queued for 0 seconds