Updating database file for localhost
Merge remote-tracking branch 'origin/master'