Refactored the db connect code to instantiate with uri
Merge branch 'develop' into staging
Changed urls and db uri