removed tracking of database-folder
unwatch derby.log
merged prefs