First Unfinished implementaion of #869.
Merging develop branch and resolve conflict.
Working implementation. Report modules need to be refactored to optimise things.
Merge upstream
[#869] Changed the default tab to basic setting.
[#904] Fix #904
Merge pull request #918 from akbargumbira/inasafe-904

Fix #904
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.
[#869] Move some default variables to safe_qgis.utilites.defaults.
[#869] Renamed some setting variables and added some tests.
Merge pull request #917 from akbargumbira/inasafe-869

Fix #869
Code standards cleanups