Add Java nature
Merge branch 'master' into core