added our database connection
Merge remote-tracking branch 'origin/Smara'