Database connection class
Merge branch 'users'