Show busy cursor while importing shakemaps
Resolved merge conflicts
Fix #632 - properly add aggregation layer source and title to report
fixed batch runner and tests
Revert "Fix #632 - properly add aggregation layer source and title to report"

This reverts commit f76f99f639a749cdf060b857315c217b628e2711.
Revert "Resolved merge conflicts"

This reverts commit ff6731e0d07a06967913905d5bc8529469856e5f.
Revert "Show busy cursor while importing shakemaps"

This reverts commit c050ea060243ff132b9cba33f0de60238cf3ef79.
fixed  the case where a multi part polygon might have a part with 'No data' as value an another part with a numeric value.
Merge branch 'master' of github.com:AIFDR/inasafe
inasafe-638 Shakemap importer does not show hourglass
Fix #638
Updated translation strings
Update tx config
Merge remote-tracking branch 'origin/master' into inasafe_qgis2

Conflicts:
	safe_qgis/tools/shakemap_importer.py
	safe_qgis/ui/resources_rc.py
fix last failed test for dock