Revert "Eclipse prefs"

This reverts commit d0b870e7d82802255133bca6c13e3bcd2295a24d.
Revert "Revert "Eclipse prefs""

This reverts commit 948024f7db9236af5077162b663e19b1a1597838.
Merge remote-tracking branch 'origin/master'