Updating Eclipse formatter/preference templates
Merge branch 'master'