Include database class
Merge branch 'dev'