More eclipse settings
Merging with local changes