optimization work for raster flood on roads #906
unit tests for raster flood optimization #906
Merge remote-tracking branch 'upstream/develop' into develop
Correct code style. Update impact function metadata #906
[#904] Fix #904
Merge pull request #918 from akbargumbira/inasafe-904

Fix #904
Merge pull request #907 from assefay/inasafe

---

Possible optimization for raster floods on roads.
I have kept both ways for now so that It is easier to compare for validation purposes.
Code formatting and variable naming cleanups.
Merge pull request #1 from timlinux/develop

More formatting improvements for PR #906
[#854] Changed the UI for template option.
[#854] The implementation of new template option's behavior
[#854] Changed the label of report templates dir option.
Merge pull request #907 from assefay/develop

optimization work for raster flood on roads #906
Merge pull request #921 from akbargumbira/inasafe-854

Change the behavior of template option. Fix #854
[#869] Merge develop and resolve conflict.