Added missing orm
Refactoring
Merge branch 'development' of https://github.com/Ghirensics/ghiro into development