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