fix merge
Merge branch 'intro-analysis' of https://github.com/AIFDR/inasafe-doc into intro-analysis