Merge branch 'develop' of github.com:AIFDR/inasafe into develop
Merge branch 'develop' of github.com:AIFDR/inasafe into develop
Don't import safe directly from safe_qgis.
Fix typo.
Coding standard again, don't import safe directly from safe_qgis.
Merge pull request #973 from akbargumbira/coding_standard

Coding standard
Tim's Review.
Merge remote-tracking branch 'origin/develop' into fix_955