Make test pass #1030 and pep8.
Merge remote-tracking branch 'origin/develop' into fix_tests
Update translation and pep8.
Elder to Elderly.
Fix unit test.
Fix conflict.
Merge pull request #1038 from akbargumbira/develop

[Realtime] Refactor things.
Merge pull request #1039 from akbargumbira/develop

Delete roman from the earth.
Fixed issue with QGIS 2.4 support - legend layer not focussed by default anymore meant impact layer was not selected and results were not showing in dock.
Merge pull request #1041 from timlinux/develop

Fixed issue with QGIS 2.4 support
Merge pull request #1042 from akbargumbira/develop

Fix gdal import.
Merge pull request #1033 from ismailsunni/fix_tests

Fix tests
Merge branch 'develop' of github.com:AIFDR/inasafe into develop