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 #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