Bug Fixing: #341 - remove custom ordered dict and replace it with built in
Merge branch 'develop' of github.com:AIFDR/inasafe into develop
Merge branch 'develop' of github.com:AIFDR/inasafe into develop
Undoing merge/rollback issues
Merge pull request #1209 from cchristelis/develop

Fix rollback
Merge branch 'develop' of https://github.com/AIFDR/inasafe into flood_categorising
297 - Rework raster layer to read on load not on get data.
Fix failing test (due to minimum needs update).
Added nodata handling standardization to only use nan's. Update loaded data to have nodata values set to nan's.
Updated test behaviour to match new nan for nodata behaviour.
Merge branch 'develop' of github.com:AIFDR/inasafe into develop
Merge pull request #1210 from cchristelis/develop

Refactor Raster data load and nodata behaviour - Issue #297
Keep up with QGIS latest version for testing.
Update some hash.
Update control file for clean water minimum needs changes in tests.
Update test after the fix of clean water.
Merge pull request #1215 from akbargumbira/develop

Update some test related to minimum needs change
Merge branch 'develop' of https://github.com/AIFDR/inasafe into flood_categorising