Starting adding messages back to aggregator
Merge branch 'dock_refactor' of github.com:AIFDR/inasafe into dock_refactor
send first message? :)
Merge branch 'dock_refactor' of github.com:AIFDR/inasafe into dock_refactor
add messages to aggregator
merge
Merge branch 'dock_refactor' of github.com:AIFDR/inasafe into dock_refactor

Conflicts:
	safe_qgis/aggregator.py
	safe_qgis/dock.py