Merge branch 'fix-haz-map-uhs-filename' of http://github.com/larsbutler/oq-engine
Merge branch 'master' of github.com:gem/oq-engine
Merge branch 'master' of github.com:gem/oq-engine
Merge branch 'clean-up-db' of http://github.com/larsbutler/oq-engine into performance-report
Added a better performance_view
Better performance output
Merge branch 'master' of github.com:gem/oq-engine
Merge branch 'master' of github.com:gem/oq-engine
first pass
Merge branch 'master' of github.com:gem/oq-engine
Merge branch 'master' into refactor-risk-calculators
classical qa tests pass
classical bcr qa tests pass
Merge branch 'master' of github.com:gem/oq-engine into performance-report
scenario qa tests pass
improved doc
all the qa tests pass
Merge branch 'master' of github.com:gem/oq-engine
risk export tests pass
added a new export tests for event based e2d