Move setup of aggregator.safe_layer from aggregator.deintersect to aggregator.setup_layers
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