Merge branch 'master' of github.com:AIFDR/inasafe into native_qgis_impact

Resolve conflicts:
	safe/api.py
Merge branch 'aggregator_wrappers' of github.com:AIFDR/inasafe into native_qgis_impact

Resolve conflicts:
	safe/api.py
Dock.setup_calculator checks if it need to call clipping procedure or not
Merge branch 'aggregator_wrappers' of github.com:AIFDR/inasafe into native_qgis_impact

Resolve conflicts:
	safe_qgis/widgets/dock.py
Pass extent parameter to impact function
Prototype of 'new-style' impact function
Merge branch 'master' of github.com:AIFDR/inasafe into native_qgis_impact
Fix merge conflicts
Merge branch 'master' of github.com:AIFDR/inasafe into native_qgis_impact
Merge branch 'master' of github.com:AIFDR/inasafe into native_qgis_impact
New impact report in road+polygon experimental impact function
Fix: extent error. The error was appearing when a user ran old-style impact finction after new-style IF
Slight improvement in appearance of impact report
Fix merge cnflicts
Fix merging errors
Fix wrong impact report calculation. (Filter by hazard attributes is used now)
Merge branch 'master' of github.com:AIFDR/inasafe into native_qgis_impact
Merge branch 'master' of github.com:AIFDR/inasafe into native_qgis_impact
Fix PEP8 issues
Merge branch 'master' of github.com:AIFDR/inasafe into native_qgis_impact