Updated database.php config to use environment variables
Merge branch 'develop'