removed database.php, hopefully added it to the .gitigore
merge from master