fixed merge conflicts
fixed merge conflict
Merge branch 'develop' of https://github.com/AIFDR/inasafe into develop
Merge branch 'develop' of https://github.com/AIFDR/inasafe into develop
Merge branch 'develop' of https://github.com/AIFDR/inasafe into develop
Merge branch 'develop' of https://github.com/AIFDR/inasafe into develop
Merge branch 'develop' of https://github.com/AIFDR/inasafe into develop
Merge branch 'develop' of https://github.com/AIFDR/inasafe into develop
Merge branch 'develop' of https://github.com/AIFDR/inasafe into develop
Merge branch 'develop' of https://github.com/AIFDR/inasafe into develop
Merge branch 'develop' of https://github.com/AIFDR/inasafe into develop
Merge branch 'develop' of https://github.com/AIFDR/inasafe into develop
Merge branch 'develop' of https://github.com/AIFDR/inasafe into develop
Merge branch 'develop' of https://github.com/AIFDR/inasafe into develop
Merge branch 'develop' of https://github.com/AIFDR/inasafe into develop
Merge branch 'develop' of https://github.com/AIFDR/inasafe into develop
Merge branch 'develop' of https://github.com/AIFDR/inasafe into develop
Merge branch 'develop' of https://github.com/AIFDR/inasafe into develop
Merge branch 'develop' of https://github.com/AIFDR/inasafe into develop
Merge branch 'develop' of https://github.com/AIFDR/inasafe into develop