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
Use unaryUnion to combine polygons #1189
Fix failing realtime unit tests.
Use get version instead of hardcoded inasafe version.
Merge pull request #1197 from akbargumbira/develop

Fix failing realtime unit test.
Bug fix: #1193, Minimum water needs changed from 105 to 67
Bring minimum needs test up to date with the new weekly water needs
Fix merge conflict.
Merge pull request #1126 from ismailsunni/fix_1114

Fix 1114 and 337
Bug Fixing: #341 - remove custom ordered dict and replace it with built in
Merge branch 'develop' of github.com:AIFDR/inasafe into develop
Merge pull request #1192 from assefay/develop

Use unaryUnion to combine polygons #1189

@Amageddon please confirm.
Try to force multi-line strings to line strings #1152
Merge pull request #1204 from assefay/develop

Try to force multi-line strings to line strings #1152