[Fix #392]

But still has one failed unit test in running full test.
[Refactor] Fix a failed test.
Merge branch 'safe_refactor' of github.com:akbargumbira/inasafe into safe_refactor