.settings/org.eclipse.core.resources.prefs
merge
upgrade cleardb.bat for windows
merge prefs