Merge remote-tracking branch 'upstream/develop' into develop
Allow adding a on_when_not_aggregating param to an IF.
This allows the IF to control if a postprocessor should be turned off when the analysis is running in aoi_mode (not aggregating).
Also added GUI for QCheckBoxes in function_options_dialog so that params with bool type will now be displayed as checkbox.
Merge pull request #886 from akbargumbira/fix-864-comments

Various refactorings regarding PR 881 comments
Bumped develop version to 2.1.0 beta. Do not merge this change to master until we are ready for release.
Merge pull request #888 from timlinux/develop

Bumped develop version to 2.1.0 beta. Do not merge this change to master...
Fix failing tests on jenkins develop branch due to version change.
Merge pull request #891 from akbargumbira/develop

Fix failing tests on jenkins develop branch due to version change.
addressed timlinux code review
code cleanup
Merge pull request #884 from mbernasocchi/inasafe-781

fix #781
Miscellaneous Markdown fixes

Plus some minor copy editing.
Merge pull request #895 from waldoj/patch-1

Miscellaneous Markdown fixes
fix 893
Merge pull request #898 from mbernasocchi/inasafe-893

[HOTFIX] Fix #893 - aggregation produces zeros for results on volcano population.
Fix use native zonal stats checkbox
Merge pull request #899 from mbernasocchi/fix-native-stats-checkbox

Fix use native zonal stats checkbox
Merge HEAD, branch 'json_keywords' of https://github.com/AIFDR/inasafe into json_keywords

Conflicts:
	metadata.txt
	safe_qgis/report/test/test_map.py
JSON - updated teh flood population evacuation function.