#626 Added depth column and better tests.
Merge branch 'master' of github.com:AIFDR/inasafe