Merge branch 'develop' of github.com:AIFDR/inasafe into develop
Almost done, except the hard one.
It works, needed a better test.
Fix for #955
Pep8
Merge remote-tracking branch 'origin/develop' into fix_955
Tim's review.
s/msg/message
Another Tim's review.
Akbar's review.
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
Merge pull request #972 from ismailsunni/fix_955

Fix 955
Tested under Ubuntu 12.04
Fix option dialog can't be opened.
Merge pull request #974 from akbargumbira/develop

Fix option dialog can't be opened.