Update .gitignore for Eclipse
Merge branch 'dev'