changed database.php and application.php back to app.php/db.php