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
2 jobs for feature/45-deal-with-discrete-fragility-functions-given-in-xml-and-not-csv-files-using-the-openquake in 2 minutes and 26 seconds (queued for 9 seconds)
Name Stage Failure
failed
linters Test
    Uninstalling losscalculator-0.1:
Successfully uninstalled losscalculator-0.1
Successfully installed losscalculator-0.1
$ make check
flake8 --max-line-length=96 losscalculator tests utils/preprocessor.py setup.py
losscalculator/damage_calculator.py:56:97: E501 line too long (128 > 96 characters)
make: *** [Makefile:5: check] Error 1
Cleaning up file based variables
ERROR: Job failed: exit code 1