fix table name ORM issue
Merge branch 'devel'