Coding standards.
Merge remote-tracking branch 'origin/develop' into develop
Merge remote-tracking branch 'origin/develop' into develop
Fix #1114, failure in single test.
Merge remote-tracking branch 'origin/develop' into develop
Pep8.
Update unit test for code coverage 80% #337
Fix merge conflict.
Merge pull request #1126 from ismailsunni/fix_1114

Fix 1114 and 337
Merge branch 'develop' of github.com:AIFDR/inasafe into develop