Show busy cursor while importing shakemaps
Resolved merge conflicts
Fix #632 - properly add aggregation layer source and title to report