removed eclipse.jdt.core.prefs
Merge remote-tracking branch 'origin/master'