Merge branch 'develop', remote-tracking branch 'upstream/develop' into develop
disable simply of polygons for roads #1300
Merge pull request #1322 from akbargumbira/develop

FIx volcano IF problem when the hazard is point.
Fix for user extents so that they can be cleared properly
Added clear button
clear button for extent selector
Add support for ordered dicts in keywords.
Merge branch 'develop' of github.com:AIFDR/inasafe into develop
Change minimum needs to int values to avoid the '.0'
Wrap resource list text
Merge pull request #1326 from timlinux/marquee_fixes

Added ability to clear user extents
Merge pull request #1313 from assefay/develop

Disable polygon simplify
Fixing file access issues.
Add Philippine minimum needs
Fix #1330 - Extents to dataset not respected.
Merge pull request #1331 from timlinux/develop

Fix #1330 - Extents to dataset not respected.
make minimum needs scrollable in the minimum needs tab
Minor comment improvement
Merge branch 'develop' of github.com:AIFDR/inasafe into inasafe-1230-minimum-needs
Merge pull request #1329 from cchristelis/develop

Add ordered dict support for keywords.