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
Run pep8 etc tests first, not last
Fix for makefile issue
Merge pull request #1311 from timlinux/papercuts

Run pylint pep8 etc first in tests and fix error in makefile caused by spaces instead of tab
fixing the safe_qgis import in safe
merging origin develop into local develop
Fixed minimum-needs test
Moved minimum_needs default to defaults.py
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.