Merge remote-tracking branch...
Merge remote-tracking branch 'origin/feature/45-deal-with-discrete-fragility-functions-given-in-xml-and-not-csv-files-using-the-openquake' into feature/45-deal-with-discrete-fragility-functions-given-in-xml-and-not-csv-files-using-the-openquake # Conflicts: # losscalculator/damage_calculator.py