use environment variable for database url
Merge branch 'master' into release