removed some odm_ db prefix harcoding
Merge branch 'develop' into issue95-odm-hardcoded-table-names
Merge branch 'issue95-odm-hardcoded-table-names' into develop