Add Eclipse 4.4 compatible workspace settings
Merge branch 'dev'