Realtime fixes to add robustness to data fetching in the event of network errors
Resolved merge conflicts with master
Remove excess blank line
IDE updates only
Added better exception handling to resolve issue #459
Pylint fix
Merge branch 'master' of github.com:AIFDR/inasafe into aggregation