Merge branch 'develop' of https://github.com/AIFDR/inasafe into develop
Merge branch 'develop' of https://github.com/AIFDR/inasafe into develop
Merge branch 'develop' of https://github.com/AIFDR/inasafe into develop
Merge branch 'develop' of github.com:AIFDR/inasafe into metadata
Merge pull request #1312 from cchristelis/develop

fixing the safe_qgis import in safe
Quick fix last quicktests - @cchristelis you need to check this
Quick fix last quicktests - @cchristelis you need to check this
Merge branch 'develop' of github.com:AIFDR/inasafe into develop

Conflicts:
	safe/impact_functions/test_plugin_core.py
Merge branch 'develop' of https://github.com/AIFDR/inasafe into develop
set target_field for styling
fix NameError: global name 'extent_to_geo_array' is not defined
Merge branch 'develop' of https://github.com/AIFDR/inasafe into develop
fixed all but one pylint and pep8.
last pep and lint.  @assefay please review this and act accordingly if needed.
applied new minimum needs
FIx volcano IF problem when the hazard is point.
implemented gmd:LI_Lineage to close #1245
Merge branch 'develop' into metadata
Merge pull request #1323 from mbernasocchi/metadata

Update Metadata
Merge pull request #1320 from essc/develop

Few fixed for generic categorised hazard IF