Removed passwords from database.php
Merged