Adding support for DB url config using ENV
Merge remote-tracking branch 'origin/master'