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